1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From: Miguel Landaeta <nomadium@debian.org>
Date: Fri, 18 Sep 2015 15:46:14 -0300
Description: Load Bouncy Castle libraries available in Debian
Forwarded: no
diff --git a/lib/jopenssl/load.rb b/lib/jopenssl/load.rb
index 1219164..eaaf958 100644
--- a/lib/jopenssl/load.rb
+++ b/lib/jopenssl/load.rb
@@ -9,14 +9,14 @@ unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
bc_jars = nil
begin
# if we have jar-dependencies we let it track the jars
- require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
- require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
+ require_jar( 'org.bouncycastle', 'bcpkix', version )
+ require_jar( 'org.bouncycastle', 'bcprov', version )
bc_jars = true
rescue LoadError
end if defined?(Jars) && ( ! Jars.skip? ) rescue nil
unless bc_jars
- load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
- load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
+ load "org/bouncycastle/bcpkix/#{version}/bcpkix-#{version}.jar"
+ load "org/bouncycastle/bcprov/#{version}/bcprov-#{version}.jar"
end
end
diff --git a/lib/jopenssl/version.rb b/lib/jopenssl/version.rb
index 8769020..19bf2df 100644
--- a/lib/jopenssl/version.rb
+++ b/lib/jopenssl/version.rb
@@ -1,6 +1,6 @@
module Jopenssl
module Version
VERSION = '0.9.11'
- BOUNCY_CASTLE_VERSION = '1.50'
+ BOUNCY_CASTLE_VERSION = 'debian'
end
end
|
