jruby-openssl 0.11.0-java → 0.13.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b0af65b0a40658f2bfafdd3d8a6bd3112dd0c13
-  data.tar.gz: a5d16510be892effe0c7e3004823136f5eaaf196
+SHA256:
+  metadata.gz: 84f4d596b14dec42d317e4dbce655038025b0fd08901240b63400db474afd86c
+  data.tar.gz: b7413e3da9dd4afda4f79093bc5d9993d79286ba34297b2a5256e7ae05b779d4
 SHA512:
-  metadata.gz: 14b8ac25affa194b9de7637468d1cf73934c99d6eaa35e6d1882de3e42aaaba27c86409423850c23b9f554f21d6bb9fc64688655de32361723ef9a1cd469df5a
-  data.tar.gz: 48cb81a70fd513ffec64a8eea55132eaaa244e61c0a1b809e7fbc32650eb8960345c4b3d527b30e0927a0158d736026d764b23dd2857982c29682e366dd11ec0
+  metadata.gz: c78e50af357bf7adcdaac3ee38b437d17a7a83b98d664cc48dec957828b5e3aa15bb4378900a9796e7efe6f94fd1e3dbc54843e48fa1a4fe9a5b5f73806a4709
+  data.tar.gz: b0a8990ed96db10431e440f1f2551686efa4cc04d902a5ecdc89ec5b11c81fc5b9f814da50d0bd74ae8bcb9bcd0fa8726494f4f1912cc2d5455dad6197ac4303

data/History.md

@@ -1,3 +1,46 @@
+## 0.13.0
+
+* [fix] ASN1::EndOfContent ancestor hierarchy (#228)
+* [fix] handle X509::Name type conversion (#206)
+* [fix] handle invalid type when creating `X509::Name`
+* [fix] `OpenSSL::X509::Name#inspect` compatibility
+* [fix] escaping with `OpenSSL::X509::Name::RFC2253`
+* [feat] implement `OpenSSL::X509::Name#to_utf8`
+* [fix] compat missing `OpenSSL::SSL::OP_NO_TLSv1_3`
+* [refactor] performance - do not encode/decode cert objects
+* [fix] make sure `Context.ciphers` are not mutated (#219)
+* [feat] support `to_java` conversion for CRL
+* [feat] support `to_java` protocol for PKey (#250)
+
+## 0.12.2
+
+* [fix] work-around JRuby 9.2 autoload behavior (#248)
+  to be able to install jruby-openssl >= 0.12 on JRuby 9.2
+  while the default gem (shipped with JRuby) is < 0.12
+* [feat] support alpn negotiation in ssl context (#247)
+* [feat] support Java cipher names on `SSLContext#ciphers=`
+* [fix] properly handle `require_jar` fallback
+
+## 0.12.1
+
+* improved compatibility with the openssl gem (version 2.2.1)
+* JOSSL now ships with a single set of openssl .rb files
+  - providing compat with `required_ruby_version = '>= 2.3.0'`
+  - flat set of .rb files at *lib/openssl/* (based on openssl gem) 
+* revisited `OpenSSL::SSL::SSLContext::DEFAULT_PARAMS` defaults
+  - implicit `verify_hostname` default .rb callback still a noop
+  - TLS continues to rely on the Java SSL engine for hostname checks
+* working TLS 1.3 support
+* droped Java 1.7 support (at least Java 8 needed to use the gem)
+* fixed `SSLContext#options` matches C OpenSSL (using `OP_ALL`)
+* no longer filter out SSLv2 (for improved OpenSSL compatibility) 
+* implemented naive `SSLContext#ciphers` caching to speed-up TLS
+* `StoreError` raised due a Java exception now retain native cause
+
+## 0.12.0 (yanked)
+
+There were Java 8 and JRuby 9.3 regressions in this release, use 0.12.1 instead.
+
 ## 0.11.0
 
 NOTE: This release aims to adapt the certificate verification logic to be aligned 

data/Mavenfile

@@ -7,7 +7,7 @@ distribution_management do
   repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
 end
 
-java_target = '1.7'
+java_target = '1.8'
 gen_sources = '${basedir}/target/generated-sources' # hard-coded in AnnotationBinder
 
 plugin( 'org.codehaus.mojo:exec-maven-plugin', '1.3.2' ) do
@@ -45,15 +45,18 @@ plugin( 'org.codehaus.mojo:build-helper-maven-plugin', '1.9' ) do
   execute_goal 'add-source', :phase => 'process-classes', :sources => [ gen_sources ]
 end
 
-plugin( :compiler, '3.1',
-        :source => '1.7', :target => java_target,
-        :encoding => 'UTF-8', :debug => true,
-        :showWarnings => true, :showDeprecation => true,
-        :excludes => [ 'module-info.java' ],
-        #:jdkToolchain => { :version => '[1.7,11)' },
+compiler_configuration = {
+    :source => '1.8', :target => java_target, :release => '8',
+    :encoding => 'UTF-8', :debug => true,
+    :showWarnings => true, :showDeprecation => true,
+    :excludes => [ 'module-info.java' ],
+    #:jdkToolchain => { :version => '[1.7,11)' },
+    :generatedSourcesDirectory => gen_sources,
+    :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ]
+}
+compiler_configuration.delete(:release) if ENV_JAVA['java.specification.version'] == '1.8'
 
-        :generatedSourcesDirectory => gen_sources,
-        :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ]) do
+plugin( :compiler, '3.9.0', compiler_configuration) do
 
   #execute_goal :compile, :id => 'annotation-binder', :phase => 'compile',
   #    :generatedSourcesDirectory => gen_sources, #:outputDirectory => gen_sources,
@@ -69,14 +72,6 @@ plugin( :compiler, '3.1',
                :compilerArgs => [ '', '-XDignore.symbol.file=true' ]
 end
 
-profile 'module-info' do
-  activation { jdk '[9,)' }
-  plugin :compiler, '3.8.1',
-         :source => '9', :target => java_target,
-         :release => '9',
-         :includes => [ 'module-info.java' ]
-end
-
 plugin :clean do
   execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
                  'filesets' => [
@@ -87,18 +82,18 @@ plugin :clean do
                  'failOnError' =>  'false' )
 end
 
-jar 'org.jruby:jruby-core', '1.7.20', :scope => :provided
+jar 'org.jruby:jruby-core', '9.1.11.0', :scope => :provided
+# for invoker generated classes we need to add javax.annotation when on Java > 8
+jar 'javax.annotation:javax.annotation-api', '1.3.1', :scope => :compile
 jar 'junit:junit', '[4.13.1,)', :scope => :test
 
-# 9.1.17.0 is Java 7 compatible (till supporting JRuby 1.7)
 # NOTE: to build on Java 11 - installing gems fails (due old jossl) with:
 #  load error: jopenssl/load -- java.lang.StringIndexOutOfBoundsException
-MVN_JRUBY_VERSION = ENV_JAVA['java.version'].to_i >= 9 ? '9.2.9.0' : '9.1.17.0'
+MVN_JRUBY_VERSION = ENV_JAVA['java.version'].to_i >= 9 ? '9.2.19.0' : '9.1.17.0'
 
 jruby_plugin! :gem do
   # when installing dependent gems we want to use the built in openssl not the one from this lib directory
-  # we compile against jruby-core-1.7.20 and want to keep this out of the plugin execution here
-  execute_goal :id => 'default-initialize', :addProjectClasspath => false, :libDirectory => 'something-which-does-not-exists'
+  execute_goal :id => 'default-package', :addProjectClasspath => false, :libDirectory => 'something-which-does-not-exists'
   execute_goals :id => 'default-push', :skip => true
 end
 
@@ -107,12 +102,12 @@ plugin :deploy, '2.8.1' do
   execute_goals( :deploy, :skip => false )
 end
 
-supported_bc_versions = %w{ 1.58 1.59 1.60 1.61 1.62 1.63 1.64 1.65 }
+supported_bc_versions = %w{ 1.60 1.61 1.62 1.63 1.64 1.65 1.66 1.67 1.68 }
 
 default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
 default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
 
-properties( 'jruby.plugins.version' => '1.1.8',
+properties( 'jruby.plugins.version' => '2.0.1', # 2.0.1
             'jruby.switches' => '-W0', # https://github.com/torquebox/jruby-maven-plugins/issues/94
             'bc.versions' => default_bc_version,
             'invoker.test' => '${bc.versions}',
@@ -151,8 +146,8 @@ invoker_run_options = {
       'runit.dir' => '${runit.dir}' }
 }
 
-jruby_9_K_versions  = %w{ 9.0.5.0 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 }
-jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.6.0 9.2.7.0 9.2.8.0 9.2.9.0 }
+jruby_9_K_versions  = %w{ 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 }
+jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.10.0 9.2.17.0 9.2.19.0 }
 
 jruby_9_K_versions.each { |version|
 profile :id => "test-#{version}" do

data/README.md

@@ -24,6 +24,9 @@ the JRuby [mailing list][1] or the [bug tracker][2].
 |      ~>0.9.18 |   1.6.8-9.1.x |  Java 6-8  |    1.50-1.55 |
 |        0.10.0 |  1.7.20-9.2.x |  Java 7-10 |    1.55-1.59 |
 |        0.10.3 |  1.7.20-9.2.x |  Java 7-11 |    1.56-1.62 |
+|      ~>0.10.5 |  1.7.20-9.3.x |  Java 7-11 |    1.60-1.68 |
+|      ~>0.11.x |   9.0.x-9.3.x |  Java 7-11 |    1.62-1.68 |
+|      ~>0.12.x |   9.1.x-9.3.x |  Java 8-15 |    1.65-1.68 |
 
 NOTE: backwards JRuby compatibility was not handled for versions <= **0.9.6** 
 

data/Rakefile

@@ -1,40 +1,27 @@
 #-*- mode: ruby -*-
 
-begin
-  require 'ruby-maven'
-rescue LoadError
-  warn "ruby-maven not available - some tasks will not work " <<
-       "either `gem install ruby-maven' or use mvn instead of rake"
-  desc "Package jopenssl.jar with the compiled classes"
-  task :jar do
-    sh "mvn prepare-package -Dmaven.test.skip=true"
-  end
-  namespace :jar do
-    desc "Package jopenssl.jar file (and dependendent jars)"
-    task :all do
-      sh "mvn package -Dmaven.test.skip=true"
-    end
-  end
-else
-  #Rake::Task[:jar].clear rescue nil
-  desc "Package jopenssl.jar with the compiled classes"
-  task :jar do
-    RubyMaven.exec( 'prepare-package -Dmaven.test.skip=true' )
-  end
-  namespace :jar do
-    desc "Package jopenssl.jar file (and dependendent jars)"
-    task :all do
-      RubyMaven.exec( 'package -Dmaven.test.skip=true' )
-    end
-  end
-  task :test_prepare do
-    RubyMaven.exec( 'prepare-package -Dmaven.test.skip=true' )
-    RubyMaven.exec( 'test-compile' ) # separate step due -Dmaven.test.skip=true
+#Rake::Task[:jar].clear rescue nil
+desc "Package jopenssl.jar with the compiled classes"
+task :jar do
+  sh( './mvnw prepare-package -Dmaven.test.skip=true' )
+end
+namespace :jar do
+  desc "Package jopenssl.jar file (and dependendent jars)"
+  task :all do
+    sh( './mvnw package -Dmaven.test.skip=true' )
   end
 end
+task :test_prepare do
+  sh( './mvnw prepare-package -Dmaven.test.skip=true' )
+  sh( './mvnw test-compile' ) # separate step due -Dmaven.test.skip=true
+end
+
+task :clean do
+  sh( './mvnw clean' )
+end
 
 task :build do
-  RubyMaven.exec('package -Dmaven.test.skip')
+  sh( './mvnw clean package -Dmaven.test.skip=true' )
 end
 
 task :default => :build
@@ -55,16 +42,15 @@ task :test => 'lib/jopenssl.jar'
 namespace :integration do
   it_path = File.expand_path('../src/test/integration', __FILE__)
   task :install do
-    Dir.chdir(it_path) do
-      ruby "-S bundle install --gemfile '#{it_path}/Gemfile'"
-    end
+    ruby "-C #{it_path} -S bundle install"
   end
   # desc "Run IT tests"
   task :test => 'lib/jopenssl.jar' do
     unless File.exist?(File.join(it_path, 'Gemfile.lock'))
       raise "bundle not installed, run `rake integration:install'"
     end
-    loader = "ARGV.each { |f| require f }" ; lib = [ 'lib', it_path ]
+    loader = "ARGV.each { |f| require f }"
+    lib = [ File.expand_path('../lib', __FILE__), it_path ]
     test_files = FileList['src/test/integration/*_test.rb'].map { |path| path.sub('src/test/integration/', '') }
     ruby "-I#{lib.join(':')} -C src/test/integration -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
   end

data/lib/jopenssl/load.rb

@@ -2,20 +2,22 @@ warn 'Loading jruby-openssl gem in a non-JRuby interpreter' unless defined? JRUB
 
 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
-  bc_jars = nil
   begin
     require 'jar-dependencies'
     # if we have jar-dependencies we let it track the jars
-    require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
-    require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
-    require_jar( 'org.bouncycastle', 'bctls-jdk15on',  version )
+    require_jar 'org.bouncycastle', 'bcprov-jdk15on', version
+    require_jar 'org.bouncycastle', 'bcpkix-jdk15on', version
+    require_jar 'org.bouncycastle', 'bctls-jdk15on',  version
+    begin # bcutil got extracted from bcprov in BC 1.69
+      require_jar 'org.bouncycastle', 'bcutil-jdk15to18', version
+    rescue LoadError, RuntimeError
+      # continue without loading the jar - assume we got BC < 1.69
+    end
     bc_jars = true
-  rescue LoadError
+  rescue LoadError, RuntimeError
     bc_jars = false
   end
   unless bc_jars
@@ -34,17 +36,50 @@ else; require 'jruby'
 end
 
 if RUBY_VERSION > '2.3'
-  load 'jopenssl23/openssl.rb'
   load 'jopenssl/_compat23.rb'
-elsif RUBY_VERSION > '2.2'
-  load 'jopenssl22/openssl.rb'
-elsif RUBY_VERSION > '2.1'
-  load 'jopenssl21/openssl.rb'
-else
-  load 'jopenssl19/openssl.rb'
 end
 
+# NOTE: content bellow should live in *lib/openssl.rb* but due RubyGems/Bundler
+# `autoload :OpenSSL` this will cause issues if an older version (0.11) is the
+# default gem under JRuby 9.2 (which on auto-load does not trigger a dynamic
+# require - this is only fixed in JRuby 9.3)
+
 module OpenSSL
   autoload :Config, 'openssl/config' unless const_defined?(:Config, false)
   autoload :PKCS12, 'openssl/pkcs12'
 end
+
+=begin
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licensed under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+=end
+
+require 'openssl/bn'
+require 'openssl/pkey'
+require 'openssl/cipher'
+#require 'openssl/config' if OpenSSL.const_defined?(:Config, false)
+require 'openssl/digest'
+require 'openssl/hmac'
+require 'openssl/x509'
+require 'openssl/ssl'
+require 'openssl/pkcs5'
+
+module OpenSSL
+  # call-seq:
+  #   OpenSSL.secure_compare(string, string) -> boolean
+  #
+  # Constant time memory comparison. Inputs are hashed using SHA-256 to mask
+  # the length of the secret. Returns +true+ if the strings are identical,
+  # +false+ otherwise.
+  def self.secure_compare(a, b)
+    hashed_a = OpenSSL::Digest.digest('SHA256', a)
+    hashed_b = OpenSSL::Digest.digest('SHA256', b)
+    OpenSSL.fixed_length_secure_compare(hashed_a, hashed_b) && a == b
+  end
+end

data/lib/jopenssl/version.rb

@@ -1,9 +1,10 @@
 module JOpenSSL
-  VERSION = '0.11.0'
+  VERSION = '0.13.0'
   BOUNCY_CASTLE_VERSION = '1.68'
 end
 
 Object.class_eval do
   Jopenssl = JOpenSSL
   private_constant :Jopenssl if respond_to?(:private_constant)
+  deprecate_constant :Jopenssl if respond_to?(:deprecate_constant)
 end

data/lib/openssl/bn.rb

@@ -1,9 +1,40 @@
-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__)}"
-else
-  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
-end
+# frozen_string_literal: true
+#--
+#
+# = Ruby-space definitions that completes C-space funcs for BN
+#
+# = Info
+# 'OpenSSL for Ruby 2' project
+# Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+# All rights reserved.
+#
+# = Licence
+# This program is licensed under the same licence as Ruby.
+# (See the file 'LICENCE'.)
+#++
+
+module OpenSSL
+  class BN
+    include Comparable
+
+    def pretty_print(q)
+      q.object_group(self) {
+        q.text ' '
+        q.text to_i.to_s
+      }
+    end
+  end # BN
+end # OpenSSL
+
+##
+#--
+# Add double dispatch to Integer
+#++
+class Integer
+  # Casts an Integer as an OpenSSL::BN
+  #
+  # See `man bn` for more info.
+  def to_bn
+    OpenSSL::BN::new(self)
+  end
+end # Integer