From ca6089eeacafd362d065ab25cf5d2d43c4cf25ed Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 11 Dec 2020 22:54:27 +0100 Subject: [PATCH] =?UTF-8?q?Add=20test=20to=20verify=20that=20primary=20key?= =?UTF-8?q?=20can=20certify=C2=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rtificationKeyMustBeAbleToCertifyTest.java | 52 +++++++++++++++++++ .../GenerateEllipticCurveKeyTest.java | 7 ++- 2 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java new file mode 100644 index 00000000..1bde8f16 --- /dev/null +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/CertificationKeyMustBeAbleToCertifyTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2020 Paul Schaub. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.pgpainless.key.generation; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; +import org.pgpainless.PGPainless; +import org.pgpainless.key.generation.type.KeyType; +import org.pgpainless.key.generation.type.ecc.EllipticCurve; +import org.pgpainless.key.generation.type.xdh.XDHCurve; + +public class CertificationKeyMustBeAbleToCertifyTest { + + /** + * Generating a key ring that has a primary key which is unable to create signatures (and therefore signatures) + * would result in an invalid key. + * This test therefore verifies that generating such keys fails. + */ + @Test + public void testCertificationIncapableKeyTypesThrow() { + KeyType[] typesIncapableOfCreatingVerifications = new KeyType[] { + KeyType.ECDH(EllipticCurve._P256), + KeyType.ECDH(EllipticCurve._P384), + KeyType.ECDH(EllipticCurve._P521), + KeyType.XDH(XDHCurve._X25519) + }; + for (KeyType type : typesIncapableOfCreatingVerifications) { + assertThrows(IllegalArgumentException.class, () -> PGPainless + .generateKeyRing() + .withMasterKey(KeySpec + .getBuilder(type) + .withDefaultKeyFlags() + .withDefaultAlgorithms()) + .withPrimaryUserId("should@throw.ex") + .withoutPassphrase().build()); + } + } +} diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java index a9d67a69..bad8eaeb 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java @@ -23,8 +23,7 @@ import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.junit.jupiter.api.Test; import org.pgpainless.PGPainless; -import org.pgpainless.key.generation.type.eddsa.EdDSA; -import org.pgpainless.key.generation.type.xdh.XDH; +import org.pgpainless.key.generation.type.KeyType; import org.pgpainless.key.generation.type.eddsa.EdDSACurve; import org.pgpainless.key.generation.type.xdh.XDHCurve; import org.pgpainless.key.util.UserId; @@ -35,10 +34,10 @@ public class GenerateEllipticCurveKeyTest { @Test public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException { PGPSecretKeyRing keyRing = PGPainless.generateKeyRing() - .withSubKey(KeySpec.getBuilder(XDH.fromCurve(XDHCurve._X25519)) + .withSubKey(KeySpec.getBuilder(KeyType.XDH(XDHCurve._X25519)) .withDefaultKeyFlags() .withDefaultAlgorithms()) - .withMasterKey(KeySpec.getBuilder(EdDSA.fromCurve(EdDSACurve._Ed25519)) + .withMasterKey(KeySpec.getBuilder(KeyType.EDDSA(EdDSACurve._Ed25519)) .withDefaultKeyFlags() .withDefaultAlgorithms()) .withPrimaryUserId(UserId.onlyEmail("alice@wonderland.lit").toString())