From a807ddbb4e5fe2201d2d65deb6b430cdad102b29 Mon Sep 17 00:00:00 2001 From: Ivan Pizhenko Date: Thu, 4 Feb 2021 09:45:08 +0200 Subject: [PATCH] use PGPainless.readKeyRing().secretKeyRing() --- .../key/modification/AddUserIdTest.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddUserIdTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddUserIdTest.java index 3ba9a268..78de7974 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddUserIdTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddUserIdTest.java @@ -91,8 +91,7 @@ public class AddUserIdTest { } @Test - public void deleteExistingAndAddNewUserIdToExistingKeyRing() - throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { + public void deleteExistingAndAddNewUserIdToExistingKeyRing() throws PGPException, IOException { final String ARMORED_PRIVATE_KEY = "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\n\r\n" + "xVgEX6UIExYJKwYBBAHaRw8BAQdAMfHf64wPQ2LC9In5AKYU/KT1qWvI7e7a\r\n" + @@ -109,8 +108,7 @@ public class AddUserIdTest { "=bk4o\r\n" + "-----END PGP PRIVATE KEY BLOCK-----\r\n"; - PGPSecretKeyRing secretKeys = readArmoredPrivateKey(ARMORED_PRIVATE_KEY.getBytes(StandardCharsets.UTF_8)); - + PGPSecretKeyRing secretKeys = PGPainless.readKeyRing().secretKeyRing(ARMORED_PRIVATE_KEY); Iterator userIds = secretKeys.getSecretKey().getPublicKey().getUserIDs(); assertEquals("", userIds.next()); assertFalse(userIds.hasNext()); @@ -125,17 +123,4 @@ public class AddUserIdTest { assertEquals("cheshirecat@wonderland.lit", userIds.next()); assertFalse(userIds.hasNext()); } - - private static PGPSecretKeyRing readArmoredPrivateKey(byte[] data) throws IOException, PGPException { - try (ByteArrayInputStream byteIn = new ByteArrayInputStream(data)) { - try (ArmoredInputStream armoredIn = new ArmoredInputStream(byteIn)) { - JcaPGPSecretKeyRingCollection keyRingCollection = new JcaPGPSecretKeyRingCollection(armoredIn); - Iterator it = keyRingCollection.getKeyRings(); - if (it.hasNext()) { - return it.next(); - } - } - } - return null; - } }