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

Migrate GenerateKeyWithoutUserIdTest

Browse source
This commit is contained in:
Paul Schaub 2025-04-01 14:16:42 +02:00
parent c8694840d8
commit 53b44e2817
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithoutUserIdTest.java
View file

@ -5,8 +5,8 @@
package org.pgpainless.key.generation; package org.pgpainless.key.generation;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.api.OpenPGPCertificate;
import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.api.OpenPGPKey;
import org.bouncycastle.util.io.Streams; import org.bouncycastle.util.io.Streams;
import org.junit.JUtils; import org.junit.JUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -42,17 +42,17 @@ public class GenerateKeyWithoutUserIdTest {
@Test @Test
public void generateKeyWithoutUserId() throws PGPException, IOException { public void generateKeyWithoutUserId() throws PGPException, IOException {
PGPainless api = PGPainless.getInstance();
Date now = new Date(); Date now = new Date();
Date expirationDate = TestTimeFrameProvider.defaultExpirationForCreationDate(now); Date expirationDate = TestTimeFrameProvider.defaultExpirationForCreationDate(now);
PGPSecretKeyRing secretKey = PGPainless.buildKeyRing() OpenPGPKey secretKey = api.buildKey()
.setPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA_LEGACY(EdDSALegacyCurve._Ed25519), KeyFlag.CERTIFY_OTHER).setKeyCreationDate(now)) .setPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA_LEGACY(EdDSALegacyCurve._Ed25519), KeyFlag.CERTIFY_OTHER).setKeyCreationDate(now))
.addSubkey(KeySpec.getBuilder(KeyType.EDDSA_LEGACY(EdDSALegacyCurve._Ed25519), KeyFlag.SIGN_DATA).setKeyCreationDate(now)) .addSubkey(KeySpec.getBuilder(KeyType.EDDSA_LEGACY(EdDSALegacyCurve._Ed25519), KeyFlag.SIGN_DATA).setKeyCreationDate(now))
.addSubkey(KeySpec.getBuilder(KeyType.XDH_LEGACY(XDHLegacySpec._X25519), KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE).setKeyCreationDate(now)) .addSubkey(KeySpec.getBuilder(KeyType.XDH_LEGACY(XDHLegacySpec._X25519), KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE).setKeyCreationDate(now))
.setExpirationDate(expirationDate) .setExpirationDate(expirationDate)
.build() .build();
.getPGPSecretKeyRing();
KeyRingInfo info = PGPainless.inspectKeyRing(secretKey); KeyRingInfo info = api.inspect(secretKey);
assertNull(info.getPrimaryUserId()); assertNull(info.getPrimaryUserId());
assertTrue(info.getUserIds().isEmpty()); assertTrue(info.getUserIds().isEmpty());
JUtils.assertDateEquals(expirationDate, info.getPrimaryKeyExpirationDate()); JUtils.assertDateEquals(expirationDate, info.getPrimaryKeyExpirationDate());
@ -60,9 +60,9 @@ public class GenerateKeyWithoutUserIdTest {
InputStream plaintextIn = new ByteArrayInputStream("Hello, World!\n".getBytes()); InputStream plaintextIn = new ByteArrayInputStream("Hello, World!\n".getBytes());
ByteArrayOutputStream ciphertextOut = new ByteArrayOutputStream(); ByteArrayOutputStream ciphertextOut = new ByteArrayOutputStream();
SecretKeyRingProtector protector = SecretKeyRingProtector.unprotectedKeys(); SecretKeyRingProtector protector = SecretKeyRingProtector.unprotectedKeys();
PGPPublicKeyRing certificate = PGPainless.extractCertificate(secretKey); OpenPGPCertificate certificate = secretKey.toCertificate();
EncryptionStream encryptionStream = PGPainless.encryptAndOrSign() EncryptionStream encryptionStream = api.generateMessage()
.onOutputStream(ciphertextOut) .onOutputStream(ciphertextOut)
.withOptions(ProducerOptions.signAndEncrypt( .withOptions(ProducerOptions.signAndEncrypt(
EncryptionOptions.get() EncryptionOptions.get()