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

Remove SignerUserId check, Policy setting only via constructor parameter

Browse source
This commit is contained in:
Paul Schaub 2025-03-24 12:40:43 +01:00
parent b97ff5bc4e
commit 8f3049602f
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
16 changed files with 125 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/SOPImpl.kt
View file

@ -28,6 +28,8 @@ class SOPImpl(
private val sopv: SOPV = SOPVImpl(api)
) : SOP {
constructor(api: PGPainless) : this(api, SOPVImpl(api))
override fun armor(): Armor = ArmorImpl(api)
override fun changeKeyPassword(): ChangeKeyPassword = ChangeKeyPasswordImpl(api)

11
pgpainless-sop/src/test/java/org/pgpainless/sop/VerifyLegacySignatureTest.java
View file

@ -123,7 +123,8 @@ public class VerifyLegacySignatureTest {
"=TtKx\n" +
"-----END PGP MESSAGE-----";
SOPImpl sop = new SOPImpl();
PGPainless api = PGPainless.getInstance();
SOPImpl sop = new SOPImpl(api);
byte[] cert = sop.extractCert().key(KEY.getBytes(StandardCharsets.UTF_8))
.getBytes();
ByteArrayAndResult<List<Verification>> result = sop.inlineVerify()
@ -134,12 +135,13 @@ public class VerifyLegacySignatureTest {
assertFalse(result.getResult().isEmpty());
// Adjust data signature hash policy to accept new SHA-1 sigs
Policy policy = PGPainless.getPolicy();
Policy policy = api.getAlgorithmPolicy();
Policy adjusted = policy.copy()
.withDataSignatureHashAlgorithmPolicy(
Policy.HashAlgorithmPolicy.static2022RevocationSignatureHashAlgorithmPolicy()
).build();
PGPainless.getInstance().setAlgorithmPolicy(adjusted);
api = new PGPainless(adjusted);
sop = new SOPImpl(api);
// Sig generated in 2024 using SHA1
String newSig = "-----BEGIN PGP MESSAGE-----\n" +
@ -164,8 +166,5 @@ public class VerifyLegacySignatureTest {
.toByteArrayAndResult();
assertFalse(result.getResult().isEmpty());
// Reset old policy
PGPainless.getInstance().setAlgorithmPolicy(policy);
}
}