[fix] PKey.read not parsing RSA pub-key

resolves #176

Author: kares

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

@@ -109,59 +109,53 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
                 pass = args[1].isNil() ? null : args[1].toString().toCharArray();
             }
 
-            final byte[] input = StringHelper.readX509PEM(context, data);
-            KeyPair key = null;
+            final RubyString str = readInitArg(context, data);
+            Object key = null;
             // d2i_PrivateKey_bio
             try {
-                key =org.jruby.ext.openssl.impl.PKey.readPrivateKey(input);
-            } catch (IOException ioe) {
-                // ignore
-            } catch (GeneralSecurityException gse) {
-                // ignore
-            }
+                key = readPrivateKey(str, pass);
+            } catch (IOException e) { /* ignore */ }
             // PEM_read_bio_PrivateKey
-            if (key == null) {
-                try {
-                    key = PEMInputOutput.readPrivateKey(new InputStreamReader(new ByteArrayInputStream(input)), pass);
-                } catch (IOException ioe) {
-                    // ignore
-                }
-            }
             if (key != null) {
-                final String alg = getAlgorithm(key);
+                final KeyPair keyPair = (KeyPair) key;
+                final String alg = getAlgorithm(keyPair);
                 if ( "RSA".equals(alg) ) {
                     return new PKeyRSA(runtime, _PKey(runtime).getClass("RSA"),
-                            (RSAPrivateCrtKey) key.getPrivate(), (RSAPublicKey) key.getPublic()
+                            (RSAPrivateCrtKey) keyPair.getPrivate(), (RSAPublicKey) keyPair.getPublic()
                     );
                 }
                 if ( "DSA".equals(alg) ) {
                     return new PKeyDSA(runtime, _PKey(runtime).getClass("DSA"),
-                            (DSAPrivateKey) key.getPrivate(), (DSAPublicKey) key.getPublic()
+                            (DSAPrivateKey) keyPair.getPrivate(), (DSAPublicKey) keyPair.getPublic()
                     );
                 }
                 if ( "ECDSA".equals(alg) ) {
                     return new PKeyEC(runtime, _PKey(runtime).getClass("EC"),
-                            (PrivateKey) key.getPrivate(), (PublicKey) key.getPublic()
+                            (PrivateKey) keyPair.getPrivate(), (PublicKey) keyPair.getPublic()
                     );
                 }
             }
 
             PublicKey pubKey = null;
+            try {
+                pubKey = PEMInputOutput.readRSAPublicKey(new StringReader(str.toString()), null);
+                return new PKeyRSA(runtime, (RSAPublicKey) pubKey);
+            } catch (IOException e) { /* ignore */ }
+            try {
+                pubKey = PEMInputOutput.readDSAPublicKey(new StringReader(str.toString()), null);
+                return new PKeyDSA(runtime, (DSAPublicKey) pubKey);
+            } catch (IOException e) { /* ignore */ }
+
+            final byte[] input = StringHelper.readX509PEM(context, str);
             // d2i_PUBKEY_bio
             try {
                 pubKey = org.jruby.ext.openssl.impl.PKey.readPublicKey(input);
-            } catch (IOException ioe) {
-                // ignore
-            } catch (GeneralSecurityException gse) {
-                // ignore
-            }
+            } catch (IOException|GeneralSecurityException e) { /* ignore */ }
             // PEM_read_bio_PUBKEY
             if (pubKey == null) {
                 try {
-                    pubKey = PEMInputOutput.readPubKey(new InputStreamReader(new ByteArrayInputStream(input)));
-                } catch (IOException ioe) {
-                    // ignore
-                }
+                    pubKey = PEMInputOutput.readPubKey(new StringReader(str.toString()));
+                } catch (IOException e) { /* ignore */ }
             }
 
             if (pubKey != null) {

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

@@ -263,8 +263,6 @@ public static PublicKey readDSAPublicKey(final KeyFactory dsaFactory, final byte
                 BigInteger p = ((ASN1Integer) seq.getObjectAt(0)).getValue();
                 BigInteger q = ((ASN1Integer) seq.getObjectAt(1)).getValue();
                 BigInteger g = ((ASN1Integer) seq.getObjectAt(2)).getValue();
-                //System.out.println(y);
-                //System.out.println(p);
                 return dsaFactory.generatePublic(new DSAPublicKeySpec(y.getPositiveValue(), p, q, g));
             }
         }

src/test/ruby/test_pkey.rb

@@ -0,0 +1,18 @@
+# coding: US-ASCII
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class TestPKey < TestCase
+
+  def test_pkey_read
+    key = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArTlm5TxJp3WHMNmWIfo/\nWvkyhJCXc1S78Y9B8lSXxXnkRqX8Twxu5EkdUP0TwgD5gp0TGy7UPm/SgWlQOcqX\nqtdOWq/Hk29Ve9z6k6wTmst7NTefmm/7OqkeYmBhfhoECLCKBADM8ctjoqD63R0e\n3bUW2knq6vCS5YMmD76/5UoU647BzB9CjgDzjuTKEbXL5AvcO5wWDgHSp7CA+2t4\nIFQvQMrPso5mvm2hNvD19vI0VjiY21rKgkJQAXSrLgkJg/fTL2wQiz10d2GnYsmx\nDeJCiBMwC+cmRW2eWePqaCPaWJwr92KsIiry+LgyGb3y01SUVV8kQgQXazutHqfu\ncQIDAQAB\n-----END PUBLIC KEY-----\n"
+
+    # assert OpenSSL::PKey::RSA.new(key).public?
+
+    pkey = OpenSSL::PKey.read(key)
+    assert_same OpenSSL::PKey::RSA, pkey.class
+    assert pkey.public?
+    assert_equal OpenSSL::PKey::RSA.new(key).n, pkey.n
+    assert_equal OpenSSL::PKey::RSA.new(key).e, pkey.e
+  end
+
+end