From a8bc929f2440d20722ba6d7b3d8a5316eb1a8867 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 31 Aug 2023 17:26:13 +0200
Subject: [PATCH] Kotlin conversion: BaseSecretKeyRingProtector

---
 .../BaseSecretKeyRingProtector.java           | 70 -------------------
 .../protection/BaseSecretKeyRingProtector.kt  | 40 +++++++++++
 2 files changed, 40 insertions(+), 70 deletions(-)
 delete mode 100644 pgpainless-core/src/main/java/org/pgpainless/key/protection/BaseSecretKeyRingProtector.java
 create mode 100644 pgpainless-core/src/main/kotlin/org/pgpainless/key/protection/BaseSecretKeyRingProtector.kt

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/protection/BaseSecretKeyRingProtector.java b/pgpainless-core/src/main/java/org/pgpainless/key/protection/BaseSecretKeyRingProtector.java
deleted file mode 100644
index fead3938..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/protection/BaseSecretKeyRingProtector.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.key.protection;
-
-import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
-import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.pgpainless.implementation.ImplementationFactory;
-import org.pgpainless.key.protection.passphrase_provider.SecretKeyPassphraseProvider;
-import org.pgpainless.util.Passphrase;
-
-import javax.annotation.Nullable;
-
-/**
- * Basic {@link SecretKeyRingProtector} implementation that respects the users {@link KeyRingProtectionSettings} when
- * encrypting keys.
- */
-public class BaseSecretKeyRingProtector implements SecretKeyRingProtector {
-
-    private final SecretKeyPassphraseProvider passphraseProvider;
-    private final KeyRingProtectionSettings protectionSettings;
-
-    /**
-     * Constructor that uses the given {@link SecretKeyPassphraseProvider} to retrieve passphrases and PGPainless'
-     * default {@link KeyRingProtectionSettings}.
-     *
-     * @param passphraseProvider provider for passphrases
-     */
-    public BaseSecretKeyRingProtector(SecretKeyPassphraseProvider passphraseProvider) {
-        this(passphraseProvider, KeyRingProtectionSettings.secureDefaultSettings());
-    }
-
-    /**
-     * Constructor that uses the given {@link SecretKeyPassphraseProvider} and {@link KeyRingProtectionSettings}.
-     *
-     * @param passphraseProvider provider for passphrases
-     * @param protectionSettings protection settings
-     */
-    public BaseSecretKeyRingProtector(SecretKeyPassphraseProvider passphraseProvider, KeyRingProtectionSettings protectionSettings) {
-        this.passphraseProvider = passphraseProvider;
-        this.protectionSettings = protectionSettings;
-    }
-
-    @Override
-    public boolean hasPassphraseFor(long keyId) {
-        return passphraseProvider.hasPassphrase(keyId);
-    }
-
-    @Override
-    @Nullable
-    public PBESecretKeyDecryptor getDecryptor(long keyId) throws PGPException {
-        Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId);
-        return passphrase == null || passphrase.isEmpty() ? null :
-                ImplementationFactory.getInstance().getPBESecretKeyDecryptor(passphrase);
-    }
-
-    @Override
-    @Nullable
-    public PBESecretKeyEncryptor getEncryptor(long keyId) throws PGPException {
-        Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId);
-        return passphrase == null || passphrase.isEmpty() ? null :
-                ImplementationFactory.getInstance().getPBESecretKeyEncryptor(
-                        protectionSettings.getEncryptionAlgorithm(),
-                        protectionSettings.getHashAlgorithm(),
-                        protectionSettings.getS2kCount(),
-                        passphrase);
-    }
-}
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/protection/BaseSecretKeyRingProtector.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/protection/BaseSecretKeyRingProtector.kt
new file mode 100644
index 00000000..450ca7f5
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/protection/BaseSecretKeyRingProtector.kt
@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.key.protection
+
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor
+import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor
+import org.pgpainless.implementation.ImplementationFactory
+import org.pgpainless.key.protection.passphrase_provider.SecretKeyPassphraseProvider
+
+/**
+ * Basic [SecretKeyRingProtector] implementation that respects the users [KeyRingProtectionSettings] when encrypting keys.
+ */
+open class BaseSecretKeyRingProtector(
+        private val passphraseProvider: SecretKeyPassphraseProvider,
+        private val protectionSettings: KeyRingProtectionSettings
+) : SecretKeyRingProtector {
+
+    constructor(passphraseProvider: SecretKeyPassphraseProvider):
+            this(passphraseProvider, KeyRingProtectionSettings.secureDefaultSettings())
+
+    override fun hasPassphraseFor(keyId: Long): Boolean = passphraseProvider.hasPassphrase(keyId)
+
+    override fun getDecryptor(keyId: Long): PBESecretKeyDecryptor? =
+            passphraseProvider.getPassphraseFor(keyId)?.let {
+                if (it.isEmpty) null
+                else ImplementationFactory.getInstance().getPBESecretKeyDecryptor(it)
+            }
+
+    override fun getEncryptor(keyId: Long): PBESecretKeyEncryptor? =
+            passphraseProvider.getPassphraseFor(keyId)?.let {
+                if (it.isEmpty) null
+                else ImplementationFactory.getInstance().getPBESecretKeyEncryptor(
+                        protectionSettings.encryptionAlgorithm,
+                        protectionSettings.hashAlgorithm,
+                        protectionSettings.s2kCount,
+                        it)
+            }
+}
\ No newline at end of file