From 07320ed3cfc4ab3cf6158a9e2ea549b5166f0372 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 28 Oct 2022 14:56:41 +0200
Subject: [PATCH] Fix HardwareSecurity.getIdsOfHardwareBackedKeys()

---
 .../decryption_verification/HardwareSecurity.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java
index f234ff00..6d9719dd 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java
@@ -47,8 +47,8 @@ public class HardwareSecurity {
      * @param secretKeys secret keys
      * @return set of keys with S2K type DIVERT_TO_CARD or GNU_DUMMY_S2K
      */
-    public static Set<Long> getIdsOfHardwareBackedKeys(PGPSecretKeyRing secretKeys) {
-        Set<Long> hardwareBackedKeys = new HashSet<>();
+    public static Set<SubkeyIdentifier> getIdsOfHardwareBackedKeys(PGPSecretKeyRing secretKeys) {
+        Set<SubkeyIdentifier> hardwareBackedKeys = new HashSet<>();
         for (PGPSecretKey secretKey : secretKeys) {
             S2K s2K = secretKey.getS2K();
             if (s2K == null) {
@@ -56,9 +56,11 @@ public class HardwareSecurity {
             }
 
             int type = s2K.getType();
+            int mode = s2K.getProtectionMode();
             // TODO: Is GNU_DUMMY_S2K appropriate?
-            if (type == S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD || type == S2K.GNU_DUMMY_S2K) {
-                hardwareBackedKeys.add(secretKey.getKeyID());
+            if (type == S2K.GNU_DUMMY_S2K && mode == S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD) {
+                SubkeyIdentifier hardwareBackedKey = new SubkeyIdentifier(secretKeys, secretKey.getKeyID());
+                hardwareBackedKeys.add(hardwareBackedKey);
             }
         }
         return hardwareBackedKeys;
@@ -75,7 +77,7 @@ public class HardwareSecurity {
         // luckily we can instantiate the BcPublicKeyDataDecryptorFactory with null as argument.
         private final PublicKeyDataDecryptorFactory factory =
                 new BcPublicKeyDataDecryptorFactory(null);
-        private SubkeyIdentifier subkey;
+        private final SubkeyIdentifier subkey;
 
         /**
          * Create a new {@link HardwareDataDecryptorFactory}.