B6 - SupportedAlgorithms: Fix IllegalArgumentException for EC.matches…

…(nonEcKey)
bcgit · vanitasvitae · Sep 8, 2026 · Sep 8, 2026 · Sep 8, 2026 · Sep 10, 2026
commit 139199d9bf325f3bc1cc6d52143e4bff5d39a2f5
diff --git a/pgsc/src/main/java/org/bouncycastle/openpgp/smartcard/card/SupportedAlgorithms.java b/pgsc/src/main/java/org/bouncycastle/openpgp/smartcard/card/SupportedAlgorithms.java
@@ -191,8 +191,12 @@ public boolean matches(int keyAlgorithm, ASN1ObjectIdentifier keyCurve)
         public boolean matches(OpenPGPCertificate.OpenPGPComponentKey key)
         {
             ASN1ObjectIdentifier keyCurve = getKeyCurveOID(key);
-            int keyAlgorithm = key.getAlgorithm();
+            if (keyCurve == null)
+            {
+                return false; // unknown key curve
+            }
 
+            int keyAlgorithm = key.getAlgorithm();
             return matches(keyAlgorithm, keyCurve);
         }
 
@@ -212,7 +216,7 @@ else if (pubKey instanceof Ed25519PublicBCPGKey)
             {
                 return EdECObjectIdentifiers.id_Ed25519;
             }
-            throw new IllegalArgumentException("unknown key type: " + pubKey.getClass().getName());
+            return null;
         }
 
         @Override