PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

ConsumerOptions: Pass down API

Browse source
This commit is contained in:
Paul Schaub 2025-03-18 13:59:35 +01:00
parent 35b0cdde7e
commit 2489237071
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/ConsumerOptions.kt
View file

@ -10,7 +10,6 @@ import java.util.*
import org.bouncycastle.bcpg.KeyIdentifier import org.bouncycastle.bcpg.KeyIdentifier
import org.bouncycastle.openpgp.* import org.bouncycastle.openpgp.*
import org.bouncycastle.openpgp.api.OpenPGPCertificate import org.bouncycastle.openpgp.api.OpenPGPCertificate
import org.bouncycastle.openpgp.api.OpenPGPImplementation
import org.bouncycastle.openpgp.api.OpenPGPKey import org.bouncycastle.openpgp.api.OpenPGPKey
import org.bouncycastle.openpgp.api.OpenPGPKeyMaterialProvider.OpenPGPCertificateProvider import org.bouncycastle.openpgp.api.OpenPGPKeyMaterialProvider.OpenPGPCertificateProvider
import org.bouncycastle.openpgp.api.OpenPGPSignature.OpenPGPDocumentSignature import org.bouncycastle.openpgp.api.OpenPGPSignature.OpenPGPDocumentSignature
@ -25,7 +24,7 @@ import org.pgpainless.util.Passphrase
import org.pgpainless.util.SessionKey import org.pgpainless.util.SessionKey
/** Options for decryption and signature verification. */ /** Options for decryption and signature verification. */
class ConsumerOptions { class ConsumerOptions(private val api: PGPainless = PGPainless.getInstance()) {
private var ignoreMDCErrors = false private var ignoreMDCErrors = false
var isDisableAsciiArmorCRC = false var isDisableAsciiArmorCRC = false
@ -33,7 +32,7 @@ class ConsumerOptions {
private var verifyNotBefore: Date? = null private var verifyNotBefore: Date? = null
private var verifyNotAfter: Date? = Date() private var verifyNotAfter: Date? = Date()
private val certificates = CertificateSource() private val certificates = CertificateSource(api)
private val detachedSignatures = mutableSetOf<PGPSignature>() private val detachedSignatures = mutableSetOf<PGPSignature>()
private var missingCertificateCallback: OpenPGPCertificateProvider? = null private var missingCertificateCallback: OpenPGPCertificateProvider? = null
@ -91,7 +90,7 @@ class ConsumerOptions {
*/ */
@Deprecated("Pass OpenPGPCertificate instead.") @Deprecated("Pass OpenPGPCertificate instead.")
fun addVerificationCert(verificationCert: PGPPublicKeyRing): ConsumerOptions = apply { fun addVerificationCert(verificationCert: PGPPublicKeyRing): ConsumerOptions = apply {
this.certificates.addCertificate(verificationCert) this.certificates.addCertificate(api.toCertificate(verificationCert))
} }
/** /**
@ -104,7 +103,7 @@ class ConsumerOptions {
fun addVerificationCerts(verificationCerts: PGPPublicKeyRingCollection): ConsumerOptions = fun addVerificationCerts(verificationCerts: PGPPublicKeyRingCollection): ConsumerOptions =
apply { apply {
for (cert in verificationCerts) { for (cert in verificationCerts) {
addVerificationCert(cert) addVerificationCert(api.toCertificate(cert))
} }
} }
@ -195,22 +194,21 @@ class ConsumerOptions {
* used to decrypt it when needed. * used to decrypt it when needed.
* *
* @param key key * @param key key
* @param keyRingProtector protector for the secret key * @param protector protector for the secret key
* @return options * @return options
*/ */
@JvmOverloads @JvmOverloads
@Deprecated("Pass OpenPGPKey instead.") @Deprecated("Pass OpenPGPKey instead.")
fun addDecryptionKey( fun addDecryptionKey(
key: PGPSecretKeyRing, key: PGPSecretKeyRing,
protector: SecretKeyRingProtector = SecretKeyRingProtector.unprotectedKeys(), protector: SecretKeyRingProtector = SecretKeyRingProtector.unprotectedKeys()
implementation: OpenPGPImplementation = PGPainless.getInstance().implementation ) = addDecryptionKey(api.toKey(key), protector)
) = addDecryptionKey(OpenPGPKey(key, implementation), protector)
/** /**
* Add the keys in the provided key collection for message decryption. * Add the keys in the provided key collection for message decryption.
* *
* @param keys key collection * @param keys key collection
* @param keyRingProtector protector for encrypted secret keys * @param protector protector for encrypted secret keys
* @return options * @return options
*/ */
@JvmOverloads @JvmOverloads
@ -220,7 +218,7 @@ class ConsumerOptions {
protector: SecretKeyRingProtector = SecretKeyRingProtector.unprotectedKeys() protector: SecretKeyRingProtector = SecretKeyRingProtector.unprotectedKeys()
) = apply { ) = apply {
for (key in keys) { for (key in keys) {
addDecryptionKey(key, protector) addDecryptionKey(api.toKey(key), protector)
} }
} }
@ -408,7 +406,7 @@ class ConsumerOptions {
* Source for OpenPGP certificates. When verifying signatures on a message, this object holds * Source for OpenPGP certificates. When verifying signatures on a message, this object holds
* available signer certificates. * available signer certificates.
*/ */
class CertificateSource { class CertificateSource(private val api: PGPainless) {
private val explicitCertificates: MutableSet<OpenPGPCertificate> = mutableSetOf() private val explicitCertificates: MutableSet<OpenPGPCertificate> = mutableSetOf()
/** /**
@ -416,13 +414,9 @@ class ConsumerOptions {
* *
* @param certificate certificate * @param certificate certificate
*/ */
@JvmOverloads
@Deprecated("Pass in an OpenPGPCertificate instead.") @Deprecated("Pass in an OpenPGPCertificate instead.")
fun addCertificate( fun addCertificate(certificate: PGPPublicKeyRing) {
certificate: PGPPublicKeyRing, explicitCertificates.add(api.toCertificate(certificate))
implementation: OpenPGPImplementation = PGPainless.getInstance().implementation
) {
explicitCertificates.add(OpenPGPCertificate(certificate, implementation))
} }
/** /**