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