From ff616827435f6b937412b08a0f6d2fac9c85c94b Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 7 Sep 2023 15:29:08 +0200
Subject: [PATCH] Kotlin conversion: XDH

---
 .../key/generation/package-info.java          |  8 ----
 .../key/generation/type/package-info.java     |  8 ----
 .../key/generation/type/xdh/XDH.java          | 45 -------------------
 .../key/generation/type/xdh/package-info.java |  8 ----
 .../pgpainless/key/generation/type/xdh/XDH.kt | 21 +++++++++
 5 files changed, 21 insertions(+), 69 deletions(-)
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/key/generation/package-info.java
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDH.java
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/package-info.java
 create mode 100644 pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/xdh/XDH.kt

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/package-info.java
deleted file mode 100644
index 96728227..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2018 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Classes related to OpenPGP key generation.
- */
-package org.pgpainless.key.generation;
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java
deleted file mode 100644
index bf048484..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2018 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Classes describing different OpenPGP key types.
- */
-package org.pgpainless.key.generation.type;
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDH.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDH.java
deleted file mode 100644
index 4e589677..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDH.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.key.generation.type.xdh;
-
-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 XDH implements KeyType {
-
-    private final XDHSpec spec;
-
-    private XDH(XDHSpec spec) {
-        this.spec = spec;
-    }
-
-    public static XDH fromSpec(XDHSpec spec) {
-        return new XDH(spec);
-    }
-
-    @Override
-    public String getName() {
-        return "XDH";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.ECDH;
-    }
-
-    @Override
-    public int getBitStrength() {
-        return spec.getBitStrength();
-    }
-
-    @Override
-    public AlgorithmParameterSpec getAlgorithmSpec() {
-        return new ECNamedCurveGenParameterSpec(spec.getName());
-    }
-
-}
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/package-info.java
deleted file mode 100644
index 96af405a..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Classes related to Diffie-Hellman on the X25519 curve.
- */
-package org.pgpainless.key.generation.type.xdh;
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/xdh/XDH.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/xdh/XDH.kt
new file mode 100644
index 00000000..06888237
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/xdh/XDH.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.key.generation.type.xdh
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec
+import org.pgpainless.algorithm.PublicKeyAlgorithm
+import org.pgpainless.key.generation.type.KeyType
+
+class XDH private constructor(spec: XDHSpec): KeyType {
+    override val name = "XDH"
+    override val algorithm = PublicKeyAlgorithm.ECDH
+    override val bitStrength = spec.bitStrength
+    override val algorithmSpec = ECNamedCurveGenParameterSpec(spec.algorithmName)
+
+    companion object {
+        @JvmStatic
+        fun fromSpec(spec: XDHSpec) = XDH(spec)
+    }
+}
\ No newline at end of file