jruby-openssl 0.12.1-java → 0.12.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b73e2783a26e7aa5254c66e325fa6c824c78b8d
-  data.tar.gz: feb0ad37fca2ead87ed151f8c543214f7912508b
+SHA256:
+  metadata.gz: 5e7e293b2549e684866105df2df1b7fdc93b930a9740bf6b5159149dfbc236e0
+  data.tar.gz: 771bace1ef936acd0ec9508f30f4636c3415a3785ebe29883490646b9221eae9
 SHA512:
-  metadata.gz: aba588920a82b3a568183ee03bcbee3175c033863654521bfc6a624be84072d510853ea2b457f8742d222e19a230c8ce67592a3df16e1ae625d1b644c7e858bf
-  data.tar.gz: ce31f7f99e2352871b2fdefc084eef1d8497a97baacf4a99a6459e39abf0cb35e66a1a4b422e454db6e9433cd6c698b22e07dc1e7688e7c580a397cc0a7ae37b
+  metadata.gz: f746ec0e6551af8004714f6345154a0c52a429283828e8a41765617627d0498083283216b33dcca9fe1dd7206aeb1bc8d9bff0b2e6999395bfe8cdaa32dd295e
+  data.tar.gz: 9261e4930fd87105dfcf2ade1cba0cf8d241623394f83ecd0c86a476d151eb12de34fa480a0838347dcc4950acebae3306746b4e0c69ebeb2c109c38ce7a81ac

data/History.md

@@ -1,3 +1,12 @@
+## 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)

data/lib/jopenssl/load.rb

@@ -5,15 +5,19 @@ require 'jopenssl/version'
 # 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,3 +38,48 @@ end
 if RUBY_VERSION > '2.3'
   load 'jopenssl/_compat23.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.12.1'
+  VERSION = '0.12.2'
   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.rb

@@ -1,43 +1,3 @@
 # frozen_string_literal: true
 
 require 'jopenssl/load'
-
-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_relative 'openssl/bn'
-require_relative 'openssl/pkey'
-require_relative 'openssl/cipher'
-#require_relative 'openssl/config' if OpenSSL.const_defined?(:Config, false)
-require_relative 'openssl/digest'
-require_relative 'openssl/hmac'
-require_relative 'openssl/x509'
-require_relative 'openssl/ssl'
-require_relative '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/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>jruby-openssl</artifactId>
-  <version>0.12.1</version>
+  <version>0.12.2</version>
   <packaging>gem</packaging>
   <name>JRuby OpenSSL</name>
   <description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -65,8 +65,8 @@ DO NOT MODIFY - GENERATED CODE
     <invoker.test>${bc.versions}</invoker.test>
     <jruby.plugins.version>2.0.1</jruby.plugins.version>
     <jruby.switches>-W0</jruby.switches>
-    <jruby.version>9.1.17.0</jruby.version>
-    <jruby.versions>9.1.17.0</jruby.versions>
+    <jruby.version>9.2.19.0</jruby.version>
+    <jruby.versions>9.2.19.0</jruby.versions>
     <mavengem-wagon.version>1.0.3</mavengem-wagon.version>
     <mavengem.wagon.version>1.0.3</mavengem.wagon.version>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -269,6 +269,7 @@ DO NOT MODIFY - GENERATED CODE
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
+          <release>8</release>
           <encoding>UTF-8</encoding>
           <debug>true</debug>
           <showWarnings>true</showWarnings>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: java
 authors:
 - Karol Bucek
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies: []
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL
   native library.
@@ -70,8 +70,7 @@ requirements:
 - jar org.bouncycastle:bcprov-jdk15on, 1.68
 - jar org.bouncycastle:bcpkix-jdk15on, 1.68
 - jar org.bouncycastle:bctls-jdk15on,  1.68
-rubyforge_project:
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: JRuby OpenSSL