Skip to content

Commit af07873

Browse files
committed
fix compilation clashing on readPrivateKey method name
1 parent 10e2bb2 commit af07873

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
import org.jruby.ext.openssl.x509store.PEMInputOutput;
6565
import static org.jruby.ext.openssl.OpenSSL.*;
6666
import org.jruby.ext.openssl.impl.CipherSpec;
67-
import static org.jruby.ext.openssl.impl.PKey.readPrivateKey;
68-
import static org.jruby.ext.openssl.impl.PKey.readPublicKey;
6967

7068
/**
7169
* @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
@@ -118,7 +116,7 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
118116
KeyPair key = null;
119117
// d2i_PrivateKey_bio
120118
try {
121-
key = readPrivateKey(input);
119+
key =org.jruby.ext.openssl.impl.PKey.readPrivateKey(input);
122120
} catch (IOException ioe) {
123121
// ignore
124122
} catch (GeneralSecurityException gse) {
@@ -145,7 +143,7 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
145143
PublicKey pubKey = null;
146144
// d2i_PUBKEY_bio
147145
try {
148-
pubKey = readPublicKey(input);
146+
pubKey = org.jruby.ext.openssl.impl.PKey.readPublicKey(input);
149147
} catch (IOException ioe) {
150148
// ignore
151149
} catch (GeneralSecurityException gse) {

0 commit comments

Comments
 (0)