simplify esp. avoid the nasty PKeyRSA/DSA #initialize as it's really not necessary

Author: kares

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

@@ -155,6 +155,12 @@ private static void dsaGenerate(PKeyDSA dsa, int keysize) throws RaiseException
         }
     }
 
+    static PKeyDSA newInstance(final Ruby runtime, final PublicKey publicKey) {
+        //if ( publicKey instanceof DSAPublicKey ) {
+        return new PKeyDSA(runtime, (DSAPublicKey) publicKey);
+        //}
+    }
+
     @JRubyMethod(rest = true, visibility = Visibility.PRIVATE)
     public IRubyObject initialize(final ThreadContext context, final IRubyObject[] args) {
         final Ruby runtime = context.runtime;

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

@@ -192,6 +192,12 @@ private static void rsaGenerate(PKeyRSA rsa, int keysize, BigInteger exp) throws
         }
     }
 
+    static PKeyRSA newInstance(final Ruby runtime, final PublicKey publicKey) {
+        //if ( publicKey instanceof RSAPublicKey ) {
+        return new PKeyRSA(runtime, (RSAPublicKey) publicKey);
+        //}
+    }
+
     @JRubyMethod(rest = true, visibility = Visibility.PRIVATE)
     public IRubyObject initialize(final ThreadContext context, final IRubyObject[] args) {
         final Ruby runtime = context.runtime;

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

@@ -463,9 +463,7 @@ DateTime getNotAfter() {
 
     @JRubyMethod
     public IRubyObject public_key(final ThreadContext context) {
-        if ( this.public_key == null ) {
-            initializePublicKey(context);
-        }
+        if ( public_key == null ) initializePublicKey();
         return public_key.callMethod(context, "public_key");
     }
 
@@ -480,40 +478,42 @@ public IRubyObject set_public_key(IRubyObject public_key) {
         return this.public_key = (PKey) public_key;
     }
 
-    private PublicKey getPublicKey() { return cert == null ? null : cert.getPublicKey(); }
+    private PublicKey getPublicKey() {
+        if ( public_key == null ) initializePublicKey();
+        return public_key.getPublicKey();
+    }
 
-    private void initializePublicKey(final ThreadContext context) throws RaiseException {
-        final boolean changed = this.changed;
+    private void initializePublicKey() throws RaiseException {
+        final Ruby runtime = getRuntime();
 
-        RubyModule OpenSSL = context.runtime.getModule("OpenSSL");
-        RubyModule PKey = (RubyModule) OpenSSL.getConstant("PKey");
+        final boolean changed = this.changed;
 
-        if ( getPublicKey() == null ) {
-            throw newCertificateError(context.runtime, "no certificate");
+        if ( cert == null ) {
+            throw newCertificateError(runtime, "no certificate");
         }
 
-        final String algorithm = getPublicKey().getAlgorithm();
-        final byte[] public_key = getPublicKey().getEncoded();
+        final PublicKey publicKey = cert.getPublicKey();
+
+        final String algorithm = publicKey.getAlgorithm();
 
         if ( "RSA".equalsIgnoreCase(algorithm) ) {
-            if ( public_key == null ) {
-                throw new IllegalStateException("no public key encoded data");
-            }
-            RubyString encoded = RubyString.newString(context.runtime, public_key);
-            set_public_key( PKey.getConstant("RSA").callMethod(context, "new", encoded) );
+            //if ( public_key == null ) {
+            //    throw new IllegalStateException("no public key encoded data");
+            //}
+            set_public_key( PKeyRSA.newInstance(runtime, publicKey) );
         }
         else if ( "DSA".equalsIgnoreCase(algorithm) ) {
-            if ( public_key == null ) {
-                throw new IllegalStateException("no public key encoded data");
-            }
-            RubyString encoded = RubyString.newString(context.runtime, public_key);
-            set_public_key( PKey.getConstant("DSA").callMethod(context, "new", encoded) );
+            //if ( public_key == null ) {
+            //    throw new IllegalStateException("no public key encoded data");
+            //}
+            set_public_key( PKeyDSA.newInstance(runtime, publicKey) );
         }
         else {
             String message = "unsupported algorithm";
             if ( algorithm != null ) message += " '" + algorithm + "'";
-            throw newCertificateError(context.runtime, message);
+            throw newCertificateError(runtime, message);
         }
+
         this.changed = changed;
     }
 
@@ -571,9 +571,7 @@ private org.bouncycastle.x509.X509V3CertificateGenerator getCertificateBuilder()
 
         generator.setNotBefore( not_before.getJavaDate() );
         generator.setNotAfter( not_after.getJavaDate() );
-
-        if ( public_key == null ) initializePublicKey(getRuntime().getCurrentContext());
-        generator.setPublicKey( public_key.getPublicKey() );
+        generator.setPublicKey( getPublicKey() );
 
         return generator;
     }