From bb796a6819b780ab77c8de44ad79aafc629d795c Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 4 Dec 2025 12:36:43 +0100
Subject: [PATCH] Remove old, commented-out code and add TODOs

---
 .../yubikey/YubikeyDecryptionTest.kt          | 19 -------------------
 .../yubikey/YubikeyKeyGeneratorTest.kt        |  2 ++
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyDecryptionTest.kt b/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyDecryptionTest.kt
index 15380d89..7b4a4225 100644
--- a/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyDecryptionTest.kt
+++ b/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyDecryptionTest.kt
@@ -122,9 +122,6 @@ class YubikeyDecryptionTest : YubikeyTest() {
         val hardwareBasedKey = helper.moveToYubikey(decKey.unlock(), yubikey, adminPin, KeyRef.DEC)
 
         // Decrypt
-
-        // TODO: Make hardware decryption transparent as shown below!
-
         val decIn =
             api.processMessage()
                 .onInputStream(msgIn)
@@ -138,21 +135,5 @@ class YubikeyDecryptionTest : YubikeyTest() {
         val msg = decIn.readAllBytes()
         decIn.close()
         assertEquals("Hello, World!\n", String(msg))
-        /*
-
-        yubikey.device.openConnection(SmartCardConnection::class.java).use {
-            val decFac = YubikeyDataDecryptorFactory.createDecryptorFromConnection(it, decKey.pgpPublicKey)
-            val decIn = api.processMessage()
-                .onInputStream(msgIn)
-                .withOptions(
-                    ConsumerOptions.get(api)
-                        .addCustomDecryptorFactory(decFac)
-                )
-            val msg = decIn.readAllBytes()
-            decIn.close()
-            assertEquals("Hello, World!\n", String(msg))
-        }
-
-         */
     }
 }
diff --git a/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyKeyGeneratorTest.kt b/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyKeyGeneratorTest.kt
index c8dc779a..3722bdea 100644
--- a/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyKeyGeneratorTest.kt
+++ b/pgpainless-yubikey/src/test/kotlin/org/pgpainless/yubikey/YubikeyKeyGeneratorTest.kt
@@ -18,6 +18,8 @@ class YubikeyKeyGeneratorTest : YubikeyTest() {
         val key = keyGen.generateModernKey(yubikey, adminPin, OpenPGPKeyVersion.v4, Date())
 
         println(key.toAsciiArmoredString())
+        // TODO: More thorough checking once key generation is implemented with binding signatures,
+        //  userids and other metadata
         for (subkey in key.secretKeys) {
             assertTrue(subkey.value.hasExternalSecretKey())
         }