From 8d67820f50435d179c83467906170604a56de503 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 30 Aug 2023 15:14:21 +0200
Subject: [PATCH] Kotlin conversion: OnePassSignatureCheck

---
 .../consumer/OnePassSignatureCheck.java       | 72 -------------------
 .../consumer/OnePassSignatureCheck.kt         | 33 +++++++++
 2 files changed, 33 insertions(+), 72 deletions(-)
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/signature/consumer/OnePassSignatureCheck.java
 create mode 100644 pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/OnePassSignatureCheck.kt

diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/OnePassSignatureCheck.java b/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/OnePassSignatureCheck.java
deleted file mode 100644
index 7a6a5b10..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/OnePassSignatureCheck.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.signature.consumer;
-
-import org.bouncycastle.openpgp.PGPOnePassSignature;
-import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.bouncycastle.openpgp.PGPSignature;
-import org.pgpainless.key.SubkeyIdentifier;
-
-/**
- * Tuple-class that bundles together a {@link PGPOnePassSignature} object, a {@link PGPPublicKeyRing}
- * destined to verify the signature, the {@link PGPSignature} itself and a record of whether the signature
- * was verified.
- */
-public class OnePassSignatureCheck {
-    private final PGPOnePassSignature onePassSignature;
-    private final PGPPublicKeyRing verificationKeys;
-    private PGPSignature signature;
-
-    /**
-     * Create a new {@link OnePassSignatureCheck}.
-     *
-     * @param onePassSignature one-pass signature packet used to initialize the signature verifier.
-     * @param verificationKeys verification keys
-     */
-    public OnePassSignatureCheck(PGPOnePassSignature onePassSignature, PGPPublicKeyRing verificationKeys) {
-        this.onePassSignature = onePassSignature;
-        this.verificationKeys = verificationKeys;
-    }
-
-    public void setSignature(PGPSignature signature) {
-        this.signature = signature;
-    }
-
-    /**
-     * Return the {@link PGPOnePassSignature} object.
-     *
-     * @return onePassSignature
-     */
-    public PGPOnePassSignature getOnePassSignature() {
-        return onePassSignature;
-    }
-
-    /**
-     * Return an identifier for the signing key.
-     *
-     * @return signing key fingerprint
-     */
-    public SubkeyIdentifier getSigningKey() {
-        return new SubkeyIdentifier(verificationKeys, onePassSignature.getKeyID());
-    }
-
-    /**
-     * Return the signature.
-     *
-     * @return signature
-     */
-    public PGPSignature getSignature() {
-        return signature;
-    }
-
-    /**
-     * Return the key ring used to verify the signature.
-     *
-     * @return verification keys
-     */
-    public PGPPublicKeyRing getVerificationKeys() {
-        return verificationKeys;
-    }
-}
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/OnePassSignatureCheck.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/OnePassSignatureCheck.kt
new file mode 100644
index 00000000..a315f577
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/OnePassSignatureCheck.kt
@@ -0,0 +1,33 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.signature.consumer
+
+import org.bouncycastle.openpgp.PGPOnePassSignature
+import org.bouncycastle.openpgp.PGPPublicKeyRing
+import org.bouncycastle.openpgp.PGPSignature
+import org.pgpainless.key.SubkeyIdentifier
+
+/**
+ * Tuple-class that bundles together a [PGPOnePassSignature] object, a [PGPPublicKeyRing]
+ * destined to verify the signature, the [PGPSignature] itself and a record of whether the signature
+ * was verified.
+ *
+ * @param onePassSignature the one-pass-signature packet
+ * @param verificationKeys certificate containing the signing subkey
+ * @param signature the signature packet
+ */
+data class OnePassSignatureCheck(
+        val onePassSignature: PGPOnePassSignature,
+        val verificationKeys: PGPPublicKeyRing,
+        var signature: PGPSignature? = null) {
+
+    /**
+     * Return an identifier for the signing key.
+     *
+     * @return signing key fingerprint
+     */
+    val signingKey: SubkeyIdentifier
+        get() = SubkeyIdentifier(verificationKeys, onePassSignature.keyID)
+}
\ No newline at end of file