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

Fix GenerateV6KeyTest.generateAEADProtectedModernKey() test

Browse source
This commit is contained in:
Paul Schaub 2025-03-16 22:07:58 +01:00
parent e284fca0f8
commit 0ff347b836
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateV6KeyTest.java
View file

@ -4,6 +4,7 @@
package org.pgpainless.key.generation; package org.pgpainless.key.generation;
import org.bouncycastle.bcpg.SecretKeyPacket;
import org.bouncycastle.bcpg.SignatureSubpacketTags; import org.bouncycastle.bcpg.SignatureSubpacketTags;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.api.OpenPGPCertificate; import org.bouncycastle.openpgp.api.OpenPGPCertificate;
@ -16,11 +17,14 @@ import org.pgpainless.algorithm.KeyFlag;
import org.pgpainless.algorithm.OpenPGPKeyVersion; import org.pgpainless.algorithm.OpenPGPKeyVersion;
import org.pgpainless.algorithm.PublicKeyAlgorithm; import org.pgpainless.algorithm.PublicKeyAlgorithm;
import org.pgpainless.key.generation.type.rsa.RsaLength; import org.pgpainless.key.generation.type.rsa.RsaLength;
import org.pgpainless.key.protection.KeyRingProtectionSettings;
import org.pgpainless.policy.Policy;
import java.io.IOException; import java.io.IOException;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class GenerateV6KeyTest { public class GenerateV6KeyTest {
@ -133,7 +137,14 @@ public class GenerateV6KeyTest {
@Test @Test
public void generateAEADProtectedModernKey() public void generateAEADProtectedModernKey()
throws IOException { throws IOException, PGPException {
Policy oldPolicy = PGPainless.getInstance().getAlgorithmPolicy();
// Change Policy to use AEAD for secret key protection
PGPainless.getInstance().setAlgorithmPolicy(
oldPolicy.copy().withKeyProtectionSettings(KeyRingProtectionSettings.aead()).build()
);
OpenPGPKey key = PGPainless.getInstance() OpenPGPKey key = PGPainless.getInstance()
.generateKey(OpenPGPKeyVersion.v6) .generateKey(OpenPGPKeyVersion.v6)
.modernKeyRing("Alice <alice@example.com>", "p455w0rd"); .modernKeyRing("Alice <alice@example.com>", "p455w0rd");
@ -143,7 +154,13 @@ public class GenerateV6KeyTest {
OpenPGPKey parsed = PGPainless.getInstance().readKey().parseKey(armored); OpenPGPKey parsed = PGPainless.getInstance().readKey().parseKey(armored);
OpenPGPKey.OpenPGPSecretKey primaryKey = key.getPrimarySecretKey(); OpenPGPKey.OpenPGPSecretKey primaryKey = key.getPrimarySecretKey();
assertEquals(SecretKeyPacket.USAGE_AEAD, primaryKey.getPGPSecretKey().getS2KUsage());
OpenPGPKey.OpenPGPPrivateKey privateKey = primaryKey.unlock("p455w0rd".toCharArray());
assertNotNull(privateKey);
assertEquals(armored, parsed.toAsciiArmoredString()); assertEquals(armored, parsed.toAsciiArmoredString());
PGPainless.getInstance().setAlgorithmPolicy(oldPolicy);
} }
} }