Skip to content

Commit c7cd35d

Browse files
kareskares
committed
load correct openssl .rb files on Ruby 2.3
1 parent 12a7980 commit c7cd35d

File tree

11 files changed

+32
-21
lines changed

11 files changed

+32
-21
lines changed

‎lib/openssl/bn.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/buffering.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/cipher.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/config.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/digest.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/pkcs7.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
if RUBY_VERSION > '2.2'
2-
raise LoadError, "no such library in 2.2: openssl/pkcs7"
3-
elsif RUBY_VERSION > '2.1'
4-
raise LoadError, "no such library in 2.1: openssl/pkcs7"
5-
elsif RUBY_VERSION > '1.9'
6-
raise LoadError, "no such library in 1.9: openssl/pkcs7"
1+
if RUBY_VERSION > '1.9'
2+
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/pkcs7"
73
else
84
load "jopenssl18/openssl/pkcs7.rb"
95
end

‎lib/openssl/pkey.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
else
4+
raise LoadError, "no such file to load -- openssl/pkey"
5+
end

‎lib/openssl/ssl-internal.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
if RUBY_VERSION > '2.2'
2-
raise LoadError, "no such library in 2.2: openssl/ssl-internal.rb"
3-
elsif RUBY_VERSION > '2.1'
4-
raise LoadError, "no such library in 2.1: openssl/ssl-internal.rb"
1+
if RUBY_VERSION > '2.1'
2+
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/ssl-internal.rb"
53
elsif RUBY_VERSION > '1.9'
64
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
75
else

‎lib/openssl/ssl.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
if RUBY_VERSION > '2.2'
1+
if RUBY_VERSION > '2.3'
2+
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
3+
elsif RUBY_VERSION > '2.2'
24
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
35
elsif RUBY_VERSION > '2.1'
46
load "jopenssl21/openssl/#{File.basename(__FILE__)}"

‎lib/openssl/x509-internal.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
if RUBY_VERSION > '2.2'
2-
raise LoadError, "no such library in 2.2: openssl/x509-internal.rb"
3-
elsif RUBY_VERSION > '2.1'
4-
raise LoadError, "no such library in 2.1: openssl/x509-internal.rb"
1+
if RUBY_VERSION > '2.1'
2+
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/x509-internal.rb"
53
elsif RUBY_VERSION > '1.9'
64
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
75
else

0 commit comments

Comments
 (0)