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: e65b319cbcdf
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: 657eee5151a4
Choose a head ref
  • 2 commits
  • 10 files changed
  • 1 contributor

Commits on May 19, 2018

  1. [refactor] remove openssl/pkcs7.rb -> since 1.8 no longer supported

    @kares
    kares committed May 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c101d1 View commit details

  2. [refactor] fallback to 19 files by default -> 1.8 support was dropped

    @kares
    kares committed May 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    657eee5 View commit details
Showing with 9 additions and 32 deletions.
  1. +1 −3 lib/openssl/bn.rb
  2. +1 −3 lib/openssl/buffering.rb
  3. +1 −3 lib/openssl/cipher.rb
  4. +1 −3 lib/openssl/config.rb
  5. +1 −3 lib/openssl/digest.rb
  6. +0 −5 lib/openssl/pkcs7.rb
  7. +1 −3 lib/openssl/ssl-internal.rb
  8. +1 −3 lib/openssl/ssl.rb
  9. +1 −3 lib/openssl/x509-internal.rb
  10. +1 −3 lib/openssl/x509.rb
4 changes: 1 addition & 3 deletions lib/openssl/bn.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/buffering.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/cipher.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/config.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/digest.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
5 changes: 0 additions & 5 deletions lib/openssl/pkcs7.rb
View file

This file was deleted.

4 changes: 1 addition & 3 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.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
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/ssl.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 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.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
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end
4 changes: 1 addition & 3 deletions lib/openssl/x509.rb
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
load "jopenssl22/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '2.1'
load "jopenssl21/openssl/#{File.basename(__FILE__)}"
elsif RUBY_VERSION > '1.9'
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
else
load "jopenssl18/openssl/#{File.basename(__FILE__)}"
load "jopenssl19/openssl/#{File.basename(__FILE__)}"
end