WIP: Explore implementing a concrete HardwareSecurity implementation using Yubikit

pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/ConsumerOptions.kt

@@ -38,7 +38,7 @@ class ConsumerOptions(private val api: PGPainless) {
 
     private var sessionKey: SessionKey? = null
     private val customDecryptorFactories =
-        mutableMapOf<SubkeyIdentifier, PublicKeyDataDecryptorFactory>()
+        mutableMapOf<KeyIdentifier, PublicKeyDataDecryptorFactory>()
     private val decryptionKeys = mutableMapOf<OpenPGPKey, SecretKeyRingProtector>()
     private val decryptionPassphrases = mutableSetOf<Passphrase>()
     private var missingKeyPassphraseStrategy = MissingKeyPassphraseStrategy.INTERACTIVE
@@ -245,7 +245,7 @@ class ConsumerOptions(private val api: PGPainless) {
      * @return options
      */
     fun addCustomDecryptorFactory(factory: CustomPublicKeyDataDecryptorFactory) = apply {
-        customDecryptorFactories[factory.subkeyIdentifier] = factory
+        customDecryptorFactories[factory.keyIdentifier] = factory
     }
 
     /**

pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/CustomPublicKeyDataDecryptorFactory.kt

@@ -4,9 +4,9 @@
 
 package org.pgpainless.decryption_verification
 
+import org.bouncycastle.bcpg.KeyIdentifier
 import org.bouncycastle.openpgp.operator.AbstractPublicKeyDataDecryptorFactory
 import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory
-import org.pgpainless.key.SubkeyIdentifier
 
 /**
  * Custom [PublicKeyDataDecryptorFactory] which can enable customized implementations of message
@@ -23,5 +23,5 @@ abstract class CustomPublicKeyDataDecryptorFactory : AbstractPublicKeyDataDecryp
      *
      * @return subkey identifier
      */
-    abstract val subkeyIdentifier: SubkeyIdentifier
+    abstract val keyIdentifier: KeyIdentifier
 }

pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/HardwareSecurity.kt

@@ -72,8 +72,8 @@ class HardwareSecurity {
      * session keys to a [DecryptionCallback]. Users can provide such a callback to delegate
      * decryption of messages to hardware security SDKs.
      */
-    class HardwareDataDecryptorFactory(
-        override val subkeyIdentifier: SubkeyIdentifier,
+    open class HardwareDataDecryptorFactory(
+        override val keyIdentifier: KeyIdentifier,
         private val callback: DecryptionCallback,
     ) : CustomPublicKeyDataDecryptorFactory() {
 
@@ -110,7 +110,7 @@ class HardwareSecurity {
         ): ByteArray {
             return try {
                 callback.decryptSessionKey(
-                    subkeyIdentifier.keyIdentifier, keyAlgorithm, secKeyData[0], pkeskVersion)
+                    keyIdentifier, keyAlgorithm, secKeyData[0], pkeskVersion)
             } catch (e: HardwareSecurityException) {
                 throw PGPException("Hardware-backed decryption failed.", e)
             }

pgpainless-yubikey/build.gradle

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2025 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+plugins {
+    id 'java-library'
+}
+
+group 'org.pgpainless'
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+
+    // Logging
+    testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
+
+    implementation(project(":pgpainless-core"))
+
+    api "com.yubico.yubikit:openpgp:$yubikitVersion"
+
+    implementation "com.google.code.findbugs:jsr305:3.0.2"
+}
+
+// https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_modular_auto
+tasks.named('jar') {
+    manifest {
+        attributes('Automatic-Module-Name': 'org.pgpainless.yubikey')
+    }
+}

pgpainless-yubikey/src/main/kotlin/org/pgpainless/yubikey/YubikeyDataDecryptorFactory.kt

@@ -0,0 +1,67 @@
+package org.pgpainless.yubikey
+
+import com.yubico.yubikit.core.smartcard.SmartCardConnection
+import com.yubico.yubikit.openpgp.KeyRef
+import com.yubico.yubikit.openpgp.OpenPgpSession
+import org.bouncycastle.bcpg.KeyIdentifier
+import org.pgpainless.decryption_verification.HardwareSecurity
+
+class YubikeyDataDecryptorFactory(
+    smartCardConnection: SmartCardConnection,
+    callback: HardwareSecurity.DecryptionCallback,
+    keyIdentifier: KeyIdentifier,
+) : HardwareSecurity.HardwareDataDecryptorFactory(keyIdentifier, callback) {
+
+    companion object {
+        @JvmStatic
+        fun createDecryptorFromConnection(smartCardConnection: SmartCardConnection): HardwareSecurity.HardwareDataDecryptorFactory {
+            val openpgpSession = OpenPgpSession(smartCardConnection)
+            val fingerprintBytes = openpgpSession.getData(KeyRef.DEC.fingerprint)
+            val decKeyIdentifier = KeyIdentifier(fingerprintBytes)
+            val rsa = true
+
+            val callback = object : HardwareSecurity.DecryptionCallback {
+                override fun decryptSessionKey(
+                    keyIdentifier: KeyIdentifier,
+                    keyAlgorithm: Int,
+                    sessionKeyData: ByteArray,
+                    pkeskVersion: Int
+                ): ByteArray {
+                    openpgpSession.verifyUserPin("asdasd".toCharArray(), true)
+                    if(rsa) {
+                        val decryptedSessionKey = openpgpSession.decrypt(sessionKeyData)
+
+                        return decryptedSessionKey
+                    } else {
+                        /*
+                        val secret = openpgpSession.decrypt(sessionKeyData)
+                        val hashAlgorithm: Int = ecPubKey.getHashAlgorithm().toInt()
+                        val symmetricKeyAlgorithm: Int = ecPubKey.getSymmetricKeyAlgorithm().toInt()
+                        val userKeyingMaterial = RFC6637Utils.createUserKeyingMaterial(
+                            this.pgpPrivKey.getPublicKeyPacket(),
+                            BcKeyFingerprintCalculator(),
+                        )
+                        val rfc6637KDFCalculator = RFC6637KDFCalculator(
+                            BcPGPDigestCalculatorProvider()[hashAlgorithm], symmetricKeyAlgorithm,
+                        )
+                        val key =
+                            KeyParameter(rfc6637KDFCalculator.createKey(secret, userKeyingMaterial))
+                        return PGPPad.unpadSessionData(
+                            BcPublicKeyDataDecryptorFactory.unwrapSessionData(
+                                keyEnc,
+                                symmetricKeyAlgorithm,
+                                key,
+                            ),
+                        )
+                         */
+                        throw UnsupportedOperationException("ECDH decryption is not yet implemented.")
+                    }
+                }
+
+            }
+
+            return YubikeyDataDecryptorFactory(smartCardConnection, callback, decKeyIdentifier)
+        }
+    }
+
+}

settings.gradle

@@ -6,5 +6,6 @@ rootProject.name = 'PGPainless'
 
 include 'pgpainless-core',
         'pgpainless-sop',
-        'pgpainless-cli'
+        'pgpainless-cli',
+        'pgpainless-yubikey'
 

version.gradle

@@ -14,5 +14,6 @@ allprojects {
         mockitoVersion = '4.5.1'
         slf4jVersion = '1.7.36'
         sopJavaVersion = '14.0.1-SNAPSHOT'
+        yubikitVersion = '2.8.2'
     }
 }