PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-22 19:08:00 +01:00
Code Issues Releases Wiki Activity

Clean up unused casts from EncryptionOptions

Browse source
This commit is contained in:
Paul Schaub 2023-10-10 13:00:01 +02:00
parent 11c1c54111
commit 853e3de472
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionOptions.kt
View file

@ -10,6 +10,7 @@ import org.bouncycastle.openpgp.operator.PGPKeyEncryptionMethodGenerator
import org.pgpainless.algorithm.EncryptionPurpose import org.pgpainless.algorithm.EncryptionPurpose
import org.pgpainless.algorithm.SymmetricKeyAlgorithm import org.pgpainless.algorithm.SymmetricKeyAlgorithm
import org.pgpainless.authentication.CertificateAuthority import org.pgpainless.authentication.CertificateAuthority
import org.pgpainless.encryption_signing.EncryptionOptions.EncryptionKeySelector
import org.pgpainless.exception.KeyException import org.pgpainless.exception.KeyException
import org.pgpainless.exception.KeyException.* import org.pgpainless.exception.KeyException.*
import org.pgpainless.implementation.ImplementationFactory import org.pgpainless.implementation.ImplementationFactory
@ -19,7 +20,6 @@ import org.pgpainless.key.info.KeyAccessor
import org.pgpainless.key.info.KeyRingInfo import org.pgpainless.key.info.KeyRingInfo
import org.pgpainless.util.Passphrase import org.pgpainless.util.Passphrase
import java.util.* import java.util.*
import javax.annotation.Nonnull
class EncryptionOptions( class EncryptionOptions(
@ -144,8 +144,8 @@ class EncryptionOptions(
for (subkey in subkeys) { for (subkey in subkeys) {
val keyId = SubkeyIdentifier(key, subkey.keyID) val keyId = SubkeyIdentifier(key, subkey.keyID)
(_keyRingInfo as MutableMap)[keyId] = info _keyRingInfo[keyId] = info
(_keyViews as MutableMap)[keyId] = KeyAccessor.ViaUserId(info, keyId, userId.toString()) _keyViews[keyId] = KeyAccessor.ViaUserId(info, keyId, userId.toString())
addRecipientKey(key, subkey, false) addRecipientKey(key, subkey, false)
} }
} }
@ -188,8 +188,8 @@ class EncryptionOptions(
for (subkey in encryptionSubkeys) { for (subkey in encryptionSubkeys) {
val keyId = SubkeyIdentifier(key, subkey.keyID) val keyId = SubkeyIdentifier(key, subkey.keyID)
(_keyRingInfo as MutableMap)[keyId] = info _keyRingInfo[keyId] = info
(_keyViews as MutableMap)[keyId] = KeyAccessor.ViaKeyId(info, keyId) _keyViews[keyId] = KeyAccessor.ViaKeyId(info, keyId)
addRecipientKey(key, subkey, wildcardKeyId) addRecipientKey(key, subkey, wildcardKeyId)
} }
} }
@ -197,7 +197,7 @@ class EncryptionOptions(
private fun addRecipientKey(certificate: PGPPublicKeyRing, private fun addRecipientKey(certificate: PGPPublicKeyRing,
key: PGPPublicKey, key: PGPPublicKey,
wildcardKeyId: Boolean) { wildcardKeyId: Boolean) {
(_encryptionKeyIdentifiers as MutableSet).add(SubkeyIdentifier(certificate, key.keyID)) _encryptionKeyIdentifiers.add(SubkeyIdentifier(certificate, key.keyID))
addEncryptionMethod(ImplementationFactory.getInstance() addEncryptionMethod(ImplementationFactory.getInstance()
.getPublicKeyKeyEncryptionMethodGenerator(key) .getPublicKeyKeyEncryptionMethodGenerator(key)
.also { it.setUseWildcardKeyID(wildcardKeyId) }) .also { it.setUseWildcardKeyID(wildcardKeyId) })
@ -228,7 +228,7 @@ class EncryptionOptions(
* @return this * @return this
*/ */
fun addEncryptionMethod(encryptionMethod: PGPKeyEncryptionMethodGenerator) = apply { fun addEncryptionMethod(encryptionMethod: PGPKeyEncryptionMethodGenerator) = apply {
(_encryptionMethods as MutableSet).add(encryptionMethod) _encryptionMethods.add(encryptionMethod)
} }
/** /**