From 14a16575a450607838b4f89be3f53ea3dbf755cf Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 20 Mar 2025 20:51:24 +0100 Subject: [PATCH] Avoid usage of PGPainless.getPolicy() --- .../kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt | 3 ++- .../org/pgpainless/signature/consumer/CertificateValidator.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt index b2d9714b..2ed50ffa 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt @@ -19,7 +19,8 @@ constructor( ) : KeySpecBuilderInterface { private val hashedSubpackets: SelfSignatureSubpackets = SignatureSubpackets() - private val algorithmSuite: AlgorithmSuite = PGPainless.getInstance().algorithmPolicy.keyGenerationAlgorithmSuite + private val algorithmSuite: AlgorithmSuite = + PGPainless.getInstance().algorithmPolicy.keyGenerationAlgorithmSuite private var preferredCompressionAlgorithms: Set? = algorithmSuite.compressionAlgorithms private var preferredHashAlgorithms: Set? = algorithmSuite.hashAlgorithms diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt index e58a677f..5d5f60b8 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt @@ -51,7 +51,7 @@ class CertificateValidator { fun validateCertificate( signature: PGPSignature, signingKeyRing: PGPPublicKeyRing, - policy: Policy = PGPainless.getPolicy() + policy: Policy = PGPainless.getInstance().algorithmPolicy ): Boolean { val signingSubkey: PGPPublicKey = signingKeyRing.getPublicKey(signature.issuerKeyId)