[fix] raise PKeyError for unsupported public key algorithm

Author: kares

src/main/java/org/jruby/ext/openssl/impl/PKey.java

@@ -193,7 +193,7 @@ private static PublicKey readPublicKey(final SubjectPublicKeyInfo publicKeyInfo)
         return keyFactory.generatePublic(new X509EncodedKeySpec(publicKeyInfo.getEncoded()));
     }
 
-    private static Type matchPublicKeyType(final AlgorithmIdentifier algId) throws IllegalArgumentException {
+    private static Type matchPublicKeyType(final AlgorithmIdentifier algId) throws IOException {
         final ASN1ObjectIdentifier algIdentifier = algId.getAlgorithm();
 
         if (X9ObjectIdentifiers.id_ecPublicKey.equals(algIdentifier)) return Type.EC;
@@ -202,7 +202,7 @@ private static Type matchPublicKeyType(final AlgorithmIdentifier algId) throws I
         if (EdECObjectIdentifiers.id_Ed25519.equals(algIdentifier)) return Type.EdDSA;
         if (EdECObjectIdentifiers.id_Ed448.equals(algIdentifier)) return Type.EdDSA;
 
-        return Type.valueOf(algIdentifier.getId());
+        throw new IOException("unsupported public key algorithm: " + algIdentifier);
     }
 
     // d2i_RSAPrivateKey_bio

test/test_pkey.rb

@@ -67,6 +67,18 @@ def test_pkey_read_pkcs8_and_check_with_cert
     assert_true cert.check_private_key(pkey)
   end
 
+  # SubjectPublicKeyInfo with an unsupported algorithm (used to escape as a Java exception)
+  def test_pkey_read_public_key_unknown_algorithm
+    spki = OpenSSL::ASN1::Sequence([
+      OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::ObjectId('1.2.3.4.5.6.7.8') ]),
+      OpenSSL::ASN1::BitString("\x00" * 32)
+    ])
+    pem = "-----BEGIN PUBLIC KEY-----\n" + [spki.to_der].pack('m') + "-----END PUBLIC KEY-----\n"
+
+    assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.read(pem) }
+    assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.read(spki.to_der) }
+  end
+
   def test_pkey_pem_file_error
     begin
       ret = OpenSSL::PKey.read('not a PEM file')