1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00

Avoid usage of PGPainless.getPolicy()

This commit is contained in:
Paul Schaub 2025-03-20 20:51:24 +01:00
parent c8880619f9
commit e61c3007c0
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 3 additions and 2 deletions

View file

@ -19,7 +19,8 @@ constructor(
) : KeySpecBuilderInterface { ) : KeySpecBuilderInterface {
private val hashedSubpackets: SelfSignatureSubpackets = SignatureSubpackets() 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<CompressionAlgorithm>? = private var preferredCompressionAlgorithms: Set<CompressionAlgorithm>? =
algorithmSuite.compressionAlgorithms algorithmSuite.compressionAlgorithms
private var preferredHashAlgorithms: Set<HashAlgorithm>? = algorithmSuite.hashAlgorithms private var preferredHashAlgorithms: Set<HashAlgorithm>? = algorithmSuite.hashAlgorithms

View file

@ -51,7 +51,7 @@ class CertificateValidator {
fun validateCertificate( fun validateCertificate(
signature: PGPSignature, signature: PGPSignature,
signingKeyRing: PGPPublicKeyRing, signingKeyRing: PGPPublicKeyRing,
policy: Policy = PGPainless.getPolicy() policy: Policy = PGPainless.getInstance().algorithmPolicy
): Boolean { ): Boolean {
val signingSubkey: PGPPublicKey = val signingSubkey: PGPPublicKey =
signingKeyRing.getPublicKey(signature.issuerKeyId) signingKeyRing.getPublicKey(signature.issuerKeyId)