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: 036dc0fd8d6f
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: 79d2f5583c9e
Choose a head ref
  • 3 commits
  • 13 files changed
  • 1 contributor

Commits on Jul 28, 2017

  1. Copy the full SHA
    98ab7bb View commit details
  2. Copy the full SHA
    ab9ff6c View commit details
  3. Copy the full SHA
    79d2f55 View commit details
3 changes: 3 additions & 0 deletions jruby-openssl.gemspec
Original file line number Diff line number Diff line change
@@ -29,6 +29,9 @@ Gem::Specification.new do |s|
s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}"
s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}"

s.required_ruby_version = '>= 1.9.3'
s.required_rubygems_version = '>= 2.4.8'

s.add_development_dependency 'jar-dependencies', '~> 0.1'

s.add_development_dependency 'mocha', '~> 1.1.0'
9 changes: 5 additions & 4 deletions lib/jopenssl/load.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
warn 'Loading jruby-openssl in a non-JRuby interpreter' unless defined? JRUBY_VERSION
warn 'Loading jruby-openssl gem in a non-JRuby interpreter' unless defined? JRUBY_VERSION

require 'java'
require 'jopenssl/version'

warn "JRuby #{JRUBY_VERSION} is not supported by jruby-openssl #{Jopenssl::VERSION}" if JRUBY_VERSION <= '1.7.20'

# NOTE: assuming user does pull in BC .jars from somewhere else on the CP
unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
version = Jopenssl::BOUNCY_CASTLE_VERSION
@@ -14,6 +16,7 @@
require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
bc_jars = true
rescue LoadError
bc_jars = false
end
unless bc_jars
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
@@ -32,10 +35,8 @@
load 'jopenssl22/openssl.rb'
elsif RUBY_VERSION > '2.1'
load 'jopenssl21/openssl.rb'
elsif RUBY_VERSION > '1.9'
load 'jopenssl19/openssl.rb'
else
load 'jopenssl18/openssl.rb'
load 'jopenssl19/openssl.rb'
end

require 'openssl/pkcs12'
23 changes: 0 additions & 23 deletions lib/jopenssl18/openssl.rb

This file was deleted.

25 changes: 0 additions & 25 deletions lib/jopenssl18/openssl/bn.rb

This file was deleted.

241 changes: 0 additions & 241 deletions lib/jopenssl18/openssl/buffering.rb

This file was deleted.

28 changes: 0 additions & 28 deletions lib/jopenssl18/openssl/cipher.rb

This file was deleted.

Loading