mirror of
https://github.com/pgpainless/pgpainless.git
synced 2025-09-11 03:09:41 +02:00
Compare commits
No commits in common. "6ca9b6f4ed8c2474eb6a2f8c5dd19455985dbb1c" and "2b155b4ec01adc50fc116ef3b6415c7d3e147a76" have entirely different histories.
6ca9b6f4ed
...
2b155b4ec0
4 changed files with 1 additions and 11 deletions
|
@ -46,7 +46,6 @@ class CachingBcPublicKeyDataDecryptorFactory(
|
||||||
return decryptorFactory.createDataDecryptor(p0, p1)
|
return decryptorFactory.createDataDecryptor(p0, p1)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Deprecated in Java")
|
|
||||||
override fun recoverSessionData(
|
override fun recoverSessionData(
|
||||||
keyAlgorithm: Int,
|
keyAlgorithm: Int,
|
||||||
secKeyData: Array<out ByteArray>,
|
secKeyData: Array<out ByteArray>,
|
||||||
|
|
|
@ -102,7 +102,6 @@ class HardwareSecurity {
|
||||||
return factory.createDataDecryptor(seipd, sessionKey)
|
return factory.createDataDecryptor(seipd, sessionKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Deprecated in Java")
|
|
||||||
override fun recoverSessionData(
|
override fun recoverSessionData(
|
||||||
keyAlgorithm: Int,
|
keyAlgorithm: Int,
|
||||||
secKeyData: Array<out ByteArray>,
|
secKeyData: Array<out ByteArray>,
|
||||||
|
|
|
@ -191,7 +191,7 @@ class KeyRingBuilder(private val version: OpenPGPKeyVersion, private val api: PG
|
||||||
private fun addSubKeys(primaryKey: PGPKeyPair, ringGenerator: PGPKeyRingGenerator) {
|
private fun addSubKeys(primaryKey: PGPKeyPair, ringGenerator: PGPKeyRingGenerator) {
|
||||||
for (subKeySpec in subKeySpecs) {
|
for (subKeySpec in subKeySpecs) {
|
||||||
val subKey = generateKeyPair(subKeySpec, version, api.implementation)
|
val subKey = generateKeyPair(subKeySpec, version, api.implementation)
|
||||||
val hashedSignatureSubpackets: SignatureSubpackets =
|
var hashedSignatureSubpackets: SignatureSubpackets =
|
||||||
SignatureSubpackets.createHashedSubpackets(subKey.publicKey).apply {
|
SignatureSubpackets.createHashedSubpackets(subKey.publicKey).apply {
|
||||||
setKeyFlags(subKeySpec.keyFlags)
|
setKeyFlags(subKeySpec.keyFlags)
|
||||||
subKeySpec.preferredHashAlgorithmsOverride?.let {
|
subKeySpec.preferredHashAlgorithmsOverride?.let {
|
||||||
|
|
|
@ -292,18 +292,15 @@ class SignatureSubpackets(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Use of this subpacket is discouraged.")
|
|
||||||
override fun addRevocationKey(revocationKey: PGPPublicKey): SignatureSubpackets = apply {
|
override fun addRevocationKey(revocationKey: PGPPublicKey): SignatureSubpackets = apply {
|
||||||
addRevocationKey(true, revocationKey)
|
addRevocationKey(true, revocationKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Use of this subpacket is discouraged.")
|
|
||||||
override fun addRevocationKey(
|
override fun addRevocationKey(
|
||||||
isCritical: Boolean,
|
isCritical: Boolean,
|
||||||
revocationKey: PGPPublicKey
|
revocationKey: PGPPublicKey
|
||||||
): SignatureSubpackets = apply { addRevocationKey(isCritical, false, revocationKey) }
|
): SignatureSubpackets = apply { addRevocationKey(isCritical, false, revocationKey) }
|
||||||
|
|
||||||
@Deprecated("Use of this subpacket is discouraged.")
|
|
||||||
override fun addRevocationKey(
|
override fun addRevocationKey(
|
||||||
isCritical: Boolean,
|
isCritical: Boolean,
|
||||||
isSensitive: Boolean,
|
isSensitive: Boolean,
|
||||||
|
@ -314,12 +311,10 @@ class SignatureSubpackets(
|
||||||
RevocationKey(isCritical, clazz, revocationKey.algorithm, revocationKey.fingerprint))
|
RevocationKey(isCritical, clazz, revocationKey.algorithm, revocationKey.fingerprint))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Use of this subpacket is discouraged.")
|
|
||||||
override fun addRevocationKey(revocationKey: RevocationKey): SignatureSubpackets = apply {
|
override fun addRevocationKey(revocationKey: RevocationKey): SignatureSubpackets = apply {
|
||||||
subpacketsGenerator.addCustomSubpacket(revocationKey)
|
subpacketsGenerator.addCustomSubpacket(revocationKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Use of this subpacket is discouraged.")
|
|
||||||
override fun clearRevocationKeys(): SignatureSubpackets = apply {
|
override fun clearRevocationKeys(): SignatureSubpackets = apply {
|
||||||
subpacketsGenerator.removePacketsOfType(SignatureSubpacketTags.REVOCATION_KEY)
|
subpacketsGenerator.removePacketsOfType(SignatureSubpacketTags.REVOCATION_KEY)
|
||||||
}
|
}
|
||||||
|
@ -455,18 +450,15 @@ class SignatureSubpackets(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Usage of subpacket is discouraged")
|
|
||||||
override fun setSignerUserId(userId: CharSequence): SignatureSubpackets = apply {
|
override fun setSignerUserId(userId: CharSequence): SignatureSubpackets = apply {
|
||||||
setSignerUserId(false, userId)
|
setSignerUserId(false, userId)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Usage of subpacket is discouraged")
|
|
||||||
override fun setSignerUserId(isCritical: Boolean, userId: CharSequence): SignatureSubpackets =
|
override fun setSignerUserId(isCritical: Boolean, userId: CharSequence): SignatureSubpackets =
|
||||||
apply {
|
apply {
|
||||||
setSignerUserId(SignerUserID(isCritical, userId.toString()))
|
setSignerUserId(SignerUserID(isCritical, userId.toString()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Usage of subpacket is discouraged")
|
|
||||||
override fun setSignerUserId(signerUserID: SignerUserID?): SignatureSubpackets = apply {
|
override fun setSignerUserId(signerUserID: SignerUserID?): SignatureSubpackets = apply {
|
||||||
subpacketsGenerator.removePacketsOfType(SignatureSubpacketTags.SIGNER_USER_ID)
|
subpacketsGenerator.removePacketsOfType(SignatureSubpacketTags.SIGNER_USER_ID)
|
||||||
signerUserID?.let { subpacketsGenerator.setSignerUserID(it.isCritical, it.rawID) }
|
signerUserID?.let { subpacketsGenerator.setSignerUserID(it.isCritical, it.rawID) }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue