add a readPrivateKey with a Java String passed directly

kares · kares · commit cff68a0e2cd2 · 2016-05-31T18:52:13.000+02:00
diff --git a/src/main/java/org/jruby/ext/openssl/PKey.java b/src/main/java/org/jruby/ext/openssl/PKey.java
@@ -362,9 +362,14 @@ protected static boolean ttySTDIN(final ThreadContext context) {
         catch (RaiseException ex) { return false; }
     }
 
+    static Object readPrivateKey(final String str, final char[] passwd)
+        throws PEMInputOutput.PasswordRequiredException, IOException {
+        return PEMInputOutput.readPrivateKey(new StringReader(str), passwd);
+    }
+
     static Object readPrivateKey(final RubyString str, final char[] passwd)
         throws PEMInputOutput.PasswordRequiredException, IOException {
-        return PEMInputOutput.readPrivateKey(new StringReader(str.toString()), passwd);
+        return readPrivateKey(str.toString(), passwd);
     }
 
     protected static RubyString readInitArg(final ThreadContext context, IRubyObject arg) {
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyDSA.java b/src/main/java/org/jruby/ext/openssl/PKeyDSA.java
@@ -178,6 +178,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
 
         final char[] passwd = password(pass);
         final RubyString str = readInitArg(context, arg);
+        final String strJava = str.toString();
 
         Object key = null;
         final KeyFactory dsaFactory;
@@ -194,27 +195,27 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
         boolean noClassDef = false;
         if ( key == null && ! noClassDef ) { // PEM_read_bio_DSAPrivateKey
             try {
-                key = readPrivateKey(str, passwd);
+                key = readPrivateKey(strJava, passwd);
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (PEMInputOutput.PasswordRequiredException retry) {
                 if ( ttySTDIN(context) ) {
-                    try { key = readPrivateKey(str, passwordPrompt(context)); }
+                    try { key = readPrivateKey(strJava, passwordPrompt(context)); }
                     catch (Exception e) { debugStackTrace(runtime, e); }
                 }
             }
             catch (Exception e) { debugStackTrace(runtime, e); }
         }
         if ( key == null && ! noClassDef ) { // PEM_read_bio_DSAPublicKey
             try {
-                key = PEMInputOutput.readDSAPublicKey(new StringReader(str.toString()), passwd);
+                key = PEMInputOutput.readDSAPublicKey(new StringReader(strJava), passwd);
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (Exception e) { debugStackTrace(runtime, e); }
         }
         if ( key == null && ! noClassDef ) { // PEM_read_bio_DSA_PUBKEY
             try {
-                key = PEMInputOutput.readDSAPubKey(new StringReader(str.toString()));
+                key = PEMInputOutput.readDSAPubKey(new StringReader(strJava));
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (Exception e) { debugStackTrace(runtime, e); }
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyRSA.java b/src/main/java/org/jruby/ext/openssl/PKeyRSA.java
@@ -217,6 +217,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
 
         final char[] passwd = password(pass);
         final RubyString str = readInitArg(context, arg);
+        final String strJava = str.toString();
 
         Object key = null;
         final KeyFactory rsaFactory;
@@ -233,27 +234,27 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
         boolean noClassDef = false;
         if ( key == null && ! noClassDef ) { // PEM_read_bio_RSAPrivateKey
             try {
-                key = readPrivateKey(str, passwd);
+                key = readPrivateKey(strJava, passwd);
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (PEMInputOutput.PasswordRequiredException retry) {
                 if ( ttySTDIN(context) ) {
-                    try { key = readPrivateKey(str, passwordPrompt(context)); }
+                    try { key = readPrivateKey(strJava, passwordPrompt(context)); }
                     catch (Exception e) { debugStackTrace(runtime, e); }
                 }
             }
             catch (Exception e) { debugStackTrace(runtime, e); }
         }
         if ( key == null && ! noClassDef )  { // PEM_read_bio_RSAPublicKey
             try {
-                key = PEMInputOutput.readRSAPublicKey(new StringReader(str.toString()), passwd);
+                key = PEMInputOutput.readRSAPublicKey(new StringReader(strJava), passwd);
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (Exception e) { debugStackTrace(runtime, e); }
         }
         if ( key == null && ! noClassDef ) { // PEM_read_bio_RSA_PUBKEY
             try {
-                key = PEMInputOutput.readRSAPubKey(new StringReader(str.toString()));
+                key = PEMInputOutput.readRSAPubKey(new StringReader(strJava));
             }
             catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }
             catch (Exception e) { debugStackTrace(runtime, e); }

Original file line number	Diff line number	Diff line change
`@@ -362,9 +362,14 @@ protected static boolean ttySTDIN(final ThreadContext context) {`
`362`	`362`	`catch (RaiseException ex) { return false; }`
`363`	`363`	`}`
`364`	`364`
	`365`	`+ static Object readPrivateKey(final String str, final char[] passwd)`
	`366`	`+ throws PEMInputOutput.PasswordRequiredException, IOException {`
	`367`	`+ return PEMInputOutput.readPrivateKey(new StringReader(str), passwd);`
	`368`	`+ }`
	`369`	`+`
`365`	`370`	`static Object readPrivateKey(final RubyString str, final char[] passwd)`
`366`	`371`	`throws PEMInputOutput.PasswordRequiredException, IOException {`
`367`		`- return PEMInputOutput.readPrivateKey(new StringReader(str.toString()), passwd);`
	`372`	`+ return readPrivateKey(str.toString(), passwd);`
`368`	`373`	`}`
`369`	`374`
`370`	`375`	`protected static RubyString readInitArg(final ThreadContext context, IRubyObject arg) {`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a`
`178`	`178`
`179`	`179`	`final char[] passwd = password(pass);`
`180`	`180`	`final RubyString str = readInitArg(context, arg);`
	`181`	`+ final String strJava = str.toString();`
`181`	`182`
`182`	`183`	`Object key = null;`
`183`	`184`	`final KeyFactory dsaFactory;`
`@@ -194,27 +195,27 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a`
`194`	`195`	`boolean noClassDef = false;`
`195`	`196`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_DSAPrivateKey`
`196`	`197`	`try {`
`197`		`- key = readPrivateKey(str, passwd);`
	`198`	`+ key = readPrivateKey(strJava, passwd);`
`198`	`199`	`}`
`199`	`200`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`200`	`201`	`catch (PEMInputOutput.PasswordRequiredException retry) {`
`201`	`202`	`if ( ttySTDIN(context) ) {`
`202`		`- try { key = readPrivateKey(str, passwordPrompt(context)); }`
	`203`	`+ try { key = readPrivateKey(strJava, passwordPrompt(context)); }`
`203`	`204`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`204`	`205`	`}`
`205`	`206`	`}`
`206`	`207`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`207`	`208`	`}`
`208`	`209`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_DSAPublicKey`
`209`	`210`	`try {`
`210`		`- key = PEMInputOutput.readDSAPublicKey(new StringReader(str.toString()), passwd);`
	`211`	`+ key = PEMInputOutput.readDSAPublicKey(new StringReader(strJava), passwd);`
`211`	`212`	`}`
`212`	`213`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`213`	`214`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`214`	`215`	`}`
`215`	`216`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_DSA_PUBKEY`
`216`	`217`	`try {`
`217`		`- key = PEMInputOutput.readDSAPubKey(new StringReader(str.toString()));`
	`218`	`+ key = PEMInputOutput.readDSAPubKey(new StringReader(strJava));`
`218`	`219`	`}`
`219`	`220`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`220`	`221`	`catch (Exception e) { debugStackTrace(runtime, e); }`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a`
`217`	`217`
`218`	`218`	`final char[] passwd = password(pass);`
`219`	`219`	`final RubyString str = readInitArg(context, arg);`
	`220`	`+ final String strJava = str.toString();`
`220`	`221`
`221`	`222`	`Object key = null;`
`222`	`223`	`final KeyFactory rsaFactory;`
`@@ -233,27 +234,27 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a`
`233`	`234`	`boolean noClassDef = false;`
`234`	`235`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_RSAPrivateKey`
`235`	`236`	`try {`
`236`		`- key = readPrivateKey(str, passwd);`
	`237`	`+ key = readPrivateKey(strJava, passwd);`
`237`	`238`	`}`
`238`	`239`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`239`	`240`	`catch (PEMInputOutput.PasswordRequiredException retry) {`
`240`	`241`	`if ( ttySTDIN(context) ) {`
`241`		`- try { key = readPrivateKey(str, passwordPrompt(context)); }`
	`242`	`+ try { key = readPrivateKey(strJava, passwordPrompt(context)); }`
`242`	`243`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`243`	`244`	`}`
`244`	`245`	`}`
`245`	`246`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`246`	`247`	`}`
`247`	`248`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_RSAPublicKey`
`248`	`249`	`try {`
`249`		`- key = PEMInputOutput.readRSAPublicKey(new StringReader(str.toString()), passwd);`
	`250`	`+ key = PEMInputOutput.readRSAPublicKey(new StringReader(strJava), passwd);`
`250`	`251`	`}`
`251`	`252`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`252`	`253`	`catch (Exception e) { debugStackTrace(runtime, e); }`
`253`	`254`	`}`
`254`	`255`	`if ( key == null && ! noClassDef ) { // PEM_read_bio_RSA_PUBKEY`
`255`	`256`	`try {`
`256`		`- key = PEMInputOutput.readRSAPubKey(new StringReader(str.toString()));`
	`257`	`+ key = PEMInputOutput.readRSAPubKey(new StringReader(strJava));`
`257`	`258`	`}`
`258`	`259`	`catch (NoClassDefFoundError e) { noClassDef = true; debugStackTrace(runtime, e); }`
`259`	`260`	`catch (Exception e) { debugStackTrace(runtime, e); }`