Skip to content

Commit 85f32f8

Browse files
committed
[experimental] support NOT loading any (BC) jars on our own ... for now (see #10)
1 parent fb7c431 commit 85f32f8

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

lib/jopenssl/load.rb

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
require 'java'
44
require 'jopenssl/version'
55

6-
version = Jopenssl::Version::BOUNCY_CASTLE_VERSION
7-
bc_jars = nil
8-
begin
9-
# if we have jar-dependencies we let it track the jars
10-
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
11-
require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
12-
bc_jars = true
13-
rescue LoadError
14-
end if defined?(Jars) && ( ! Jars.skip? ) rescue nil
15-
unless bc_jars
16-
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
17-
load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
6+
# NOTE: assuming user does pull in BC .jars from somewhere else on the CP
7+
unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
8+
version = Jopenssl::Version::BOUNCY_CASTLE_VERSION
9+
bc_jars = nil
10+
begin
11+
# if we have jar-dependencies we let it track the jars
12+
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
13+
require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
14+
bc_jars = true
15+
rescue LoadError
16+
end if defined?(Jars) && ( ! Jars.skip? ) rescue nil
17+
unless bc_jars
18+
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
19+
load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
20+
end
1821
end
1922

2023
require 'jruby'

0 commit comments

Comments
 (0)