Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12a798075908
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f15abeb59a5d
Choose a head ref
  • 2 commits
  • 12 files changed
  • 1 contributor

Commits on Dec 21, 2015

  1. load correct openssl .rb files on Ruby 2.3

    @kares
    kares committed Dec 21, 2015
    Copy the full SHA
    c7cd35d View commit details

  2. use UDPSocket as older JRuby 1.7.x seems to have a bug

    @kares
    kares committed Dec 21, 2015
    Copy the full SHA
    f15abeb View commit details
4 changes: 3 additions & 1 deletion lib/openssl/bn.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
4 changes: 3 additions & 1 deletion lib/openssl/buffering.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
4 changes: 3 additions & 1 deletion lib/openssl/cipher.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
4 changes: 3 additions & 1 deletion lib/openssl/config.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
4 changes: 3 additions & 1 deletion lib/openssl/digest.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
8 changes: 2 additions & 6 deletions lib/openssl/pkcs7.rb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
if RUBY_VERSION > '2.2'
raise LoadError, "no such library in 2.2: openssl/pkcs7"
elsif RUBY_VERSION > '2.1'
raise LoadError, "no such library in 2.1: openssl/pkcs7"
elsif RUBY_VERSION > '1.9'
raise LoadError, "no such library in 1.9: openssl/pkcs7"
if RUBY_VERSION > '1.9'
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/pkcs7"
else
load "jopenssl18/openssl/pkcs7.rb"
end
5 changes: 5 additions & 0 deletions lib/openssl/pkey.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
else
raise LoadError, "no such file to load -- openssl/pkey"
end
6 changes: 2 additions & 4 deletions lib/openssl/ssl-internal.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
if RUBY_VERSION > '2.2'
raise LoadError, "no such library in 2.2: openssl/ssl-internal.rb"
elsif RUBY_VERSION > '2.1'
raise LoadError, "no such library in 2.1: openssl/ssl-internal.rb"
if RUBY_VERSION > '2.1'
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/ssl-internal.rb"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
4 changes: 3 additions & 1 deletion lib/openssl/ssl.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
6 changes: 2 additions & 4 deletions lib/openssl/x509-internal.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
if RUBY_VERSION > '2.2'
raise LoadError, "no such library in 2.2: openssl/x509-internal.rb"
elsif RUBY_VERSION > '2.1'
raise LoadError, "no such library in 2.1: openssl/x509-internal.rb"
if RUBY_VERSION > '2.1'
raise LoadError, "no such library in #{RUBY_VERSION}: openssl/x509-internal.rb"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
4 changes: 3 additions & 1 deletion lib/openssl/x509.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if RUBY_VERSION > '2.2'
if RUBY_VERSION > '2.3'
load "jopenssl23/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.2'
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
2 changes: 1 addition & 1 deletion src/test/ruby/ssl/test_socket.rb
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ def test_sync_close_without_connect
end
else
begin
socket = Socket.new :INET, :STREAM
socket = UDPSocket.new :INET
assert ! socket.closed?
ssl = OpenSSL::SSL::SSLSocket.new(socket)
ssl.sync_close = true