Skip to content

Commit dcf482c

Browse files
committed
avoid java.xx imports and maintain compatibility for JRuby 1.7
1 parent c0378b4 commit dcf482c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

lib/openssl/pkcs12.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ class PKCS12
55
class PKCS12Error < OpenSSLError
66
end
77

8-
java_import java.io.StringReader
9-
java_import java.io.StringBufferInputStream
10-
java_import java.io.ByteArrayOutputStream
118
java_import 'org.jruby.ext.openssl.PEMUtils'
129
java_import 'org.jruby.ext.openssl.SecurityHelper'
1310

@@ -27,11 +24,11 @@ def initialize(str = nil, password = '')
2724
@der = file.read
2825
file.close
2926
else
30-
str.force_encoding(Encoding::ASCII_8BIT)
27+
str.force_encoding(Encoding::ASCII_8BIT) if str.respond_to?(:force_encoding)
3128
@der = str
3229
end
3330

34-
p12_input_stream = StringBufferInputStream.new(@der)
31+
p12_input_stream = java.io.StringBufferInputStream.new(@der)
3532

3633
store = SecurityHelper.getKeyStore("PKCS12")
3734
store.load(p12_input_stream, password.to_java.to_char_array)
@@ -87,7 +84,7 @@ def generate(pass, alias_name, key, cert, ca = nil)
8784

8885
begin
8986
der_bytes = PEMUtils.generatePKCS12(
90-
StringReader.new(key.to_pem), certificates.to_java_bytes,
87+
java.io.StringReader.new(key.to_pem), certificates.to_java_bytes,
9188
alias_name, ( pass.nil? ? "" : pass ).to_java.to_char_array
9289
)
9390
rescue java.security.KeyStoreException, java.security.cert.CertificateException => e

0 commit comments

Comments
 (0)