@@ -5,9 +5,6 @@ class PKCS12
5
5
class PKCS12Error < OpenSSLError
6
6
end
7
7
8
- java_import java . io . StringReader
9
- java_import java . io . StringBufferInputStream
10
- java_import java . io . ByteArrayOutputStream
11
8
java_import 'org.jruby.ext.openssl.PEMUtils'
12
9
java_import 'org.jruby.ext.openssl.SecurityHelper'
13
10
@@ -27,11 +24,11 @@ def initialize(str = nil, password = '')
27
24
@der = file . read
28
25
file . close
29
26
else
30
- str . force_encoding ( Encoding ::ASCII_8BIT )
27
+ str . force_encoding ( Encoding ::ASCII_8BIT ) if str . respond_to? ( :force_encoding )
31
28
@der = str
32
29
end
33
30
34
- p12_input_stream = StringBufferInputStream . new ( @der )
31
+ p12_input_stream = java . io . StringBufferInputStream . new ( @der )
35
32
36
33
store = SecurityHelper . getKeyStore ( "PKCS12" )
37
34
store . load ( p12_input_stream , password . to_java . to_char_array )
@@ -87,7 +84,7 @@ def generate(pass, alias_name, key, cert, ca = nil)
87
84
88
85
begin
89
86
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 ,
91
88
alias_name , ( pass . nil? ? "" : pass ) . to_java . to_char_array
92
89
)
93
90
rescue java . security . KeyStoreException , java . security . cert . CertificateException => e
0 commit comments