Refactor keytype related classes

pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java

@@ -53,8 +53,8 @@
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.SignatureType;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.EllipticCurve;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.util.UserId;
 import org.pgpainless.provider.ProviderFactory;
 import org.pgpainless.util.Passphrase;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/curve/EllipticCurve.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/EllipticCurve.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.curve;
+package org.pgpainless.key.generation.type;
 
 import javax.annotation.Nonnull;
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/length/KeyLength.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/KeyLength.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.length;
+package org.pgpainless.key.generation.type;
 
 public interface KeyLength {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/KeyType.java

@@ -18,8 +18,10 @@
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.ecdh.ECDH;
+import org.pgpainless.key.generation.type.ecdsa.ECDSA;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RSA;
 
 public interface KeyType {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ECDH.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdh/ECDH.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Paul Schaub.
+ * 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.
@@ -13,20 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.ecdh;
 
 import javax.annotation.Nonnull;
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.KeyType;
+import org.pgpainless.key.generation.type.EllipticCurve;
 
-public class ECDH implements KeyType {
+public final class ECDH implements KeyType {
 
     private final EllipticCurve curve;
 
-    ECDH(EllipticCurve curve) {
+    private ECDH(EllipticCurve curve) {
         this.curve = curve;
     }
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/curve/package-info.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdh/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Paul Schaub.
+ * 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.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 /**
- * Classes related to elliptic curve cryptography.
+ * Classes related to ECDH.
  */
-package org.pgpainless.key.generation.type.curve;
+package org.pgpainless.key.generation.type.ecdh;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ECDSA.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdsa/ECDSA.java

@@ -13,18 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.ecdsa;
 
 
+import java.security.spec.AlgorithmParameterSpec;
 import javax.annotation.Nonnull;
 
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.EllipticCurve;
+import org.pgpainless.key.generation.type.KeyType;
 
-public class ECDSA extends ECDH {
+public final class ECDSA implements KeyType {
 
-    ECDSA(@Nonnull EllipticCurve curve) {
-        super(curve);
+    private final EllipticCurve curve;
+
+    private ECDSA(@Nonnull EllipticCurve curve) {
+        this.curve = curve;
     }
 
     public static ECDSA fromCurve(@Nonnull EllipticCurve curve) {
@@ -40,4 +45,9 @@ public String getName() {
     public PublicKeyAlgorithm getAlgorithm() {
         return PublicKeyAlgorithm.ECDSA;
     }
+
+    @Override
+    public AlgorithmParameterSpec getAlgorithmSpec() {
+        return new ECNamedCurveGenParameterSpec(curve.getName());
+    }
 }

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdsa/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+/**
+ * Classes related to ECDSA.
+ */
+package org.pgpainless.key.generation.type.ecdsa;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSA.java

@@ -0,0 +1,50 @@
+/*
+ * 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.type.eddsa;
+
+import java.security.spec.AlgorithmParameterSpec;
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
+import org.pgpainless.key.generation.type.KeyType;
+
+public final class EdDSA implements KeyType {
+
+    private final EdDSACurve curve;
+
+    private EdDSA(EdDSACurve curve) {
+        this.curve = curve;
+    }
+
+    public static EdDSA fromCurve(EdDSACurve curve) {
+        return new EdDSA(curve);
+    }
+
+    @Override
+    public String getName() {
+        return "EdDSA";
+    }
+
+    @Override
+    public PublicKeyAlgorithm getAlgorithm() {
+        return PublicKeyAlgorithm.EDDSA;
+    }
+
+    @Override
+    public AlgorithmParameterSpec getAlgorithmSpec() {
+        return new ECNamedCurveGenParameterSpec(curve.getName());
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSACurve.java

@@ -0,0 +1,33 @@
+/*
+ * 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.type.eddsa;
+
+import javax.annotation.Nonnull;
+
+public enum EdDSACurve {
+    _Ed25519("ed25519"),
+    ;
+
+    final String name;
+
+    EdDSACurve(@Nonnull String curveName) {
+        this.name = curveName;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+/**
+ * Classes related to EdDSA.
+ */
+package org.pgpainless.key.generation.type.eddsa;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/length/ElGamalLength.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamalLength.java

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.length;
+package org.pgpainless.key.generation.type.elgamal;
 
 import java.math.BigInteger;
 
+import org.pgpainless.key.generation.type.KeyLength;
+
 /**
  * The following primes are taken from RFC-3526.
  *

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ElGamal_ENCRYPT.java → pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal_ENCRYPT.java

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.elgamal;
 
 import javax.annotation.Nonnull;
 
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.length.ElGamalLength;
 
 public class ElGamal_ENCRYPT extends ElGamal_GENERAL {