jruby-openssl 0.10.0-java → 0.10.1-java

data/lib/openssl/digest.rb

@@ -4,8 +4,6 @@ elsif RUBY_VERSION > '2.2'
   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

data/lib/openssl/pkcs12.rb

@@ -28,10 +28,8 @@ module OpenSSL
         @der = str
       end
 
-      p12_input_stream = java.io.StringBufferInputStream.new(@der)
-
       store = SecurityHelper.getKeyStore("PKCS12")
-      store.load(p12_input_stream, password.to_java.to_char_array)
+      store.load(java.io.ByteArrayInputStream.new(@der.to_java_bytes), password.to_java.to_char_array)
 
       aliases = store.aliases
       aliases.each do |alias_name|

data/lib/openssl/pkcs5.rb

@@ -0,0 +1,22 @@
+#--
+# Ruby/OpenSSL Project
+# Copyright (C) 2017 Ruby/OpenSSL Project Authors
+#++
+
+# JOpenSSL has these - here for explicit require 'openssl/pkcs5' compatibility
+
+# module OpenSSL
+#   module PKCS5
+#     module_function
+#
+#     # OpenSSL::PKCS5.pbkdf2_hmac has been renamed to OpenSSL::KDF.pbkdf2_hmac.
+#     # This method is provided for backwards compatibility.
+#     def pbkdf2_hmac(pass, salt, iter, keylen, digest)
+#       OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter, length: keylen, hash: digest)
+#     end
+#
+#     def pbkdf2_hmac_sha1(pass, salt, iter, keylen)
+#       pbkdf2_hmac(pass, salt, iter, keylen, "sha1")
+#     end
+#   end
+# end

data/lib/openssl/ssl-internal.rb

@@ -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

data/lib/openssl/ssl.rb

@@ -4,8 +4,6 @@ elsif RUBY_VERSION > '2.2'
   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

data/lib/openssl/x509-internal.rb

@@ -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

data/lib/openssl/x509.rb

@@ -4,8 +4,6 @@ elsif RUBY_VERSION > '2.2'
   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

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>jruby-openssl</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</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>
@@ -57,7 +57,7 @@ DO NOT MODIFIY - GENERATED CODE
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <bc.versions></bc.versions>
+    <bc.versions>1.59</bc.versions>
     <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <invoker.skip>${maven.test.skip}</invoker.skip>
     <jruby.version>1.7.20</jruby.version>
@@ -109,7 +109,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>1.7.17</version>
+      <version>1.7.20</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -124,16 +124,6 @@ DO NOT MODIFIY - GENERATED CODE
       <id>rubygems-releases</id>
       <url>http://rubygems-proxy.torquebox.org/releases</url>
     </repository>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </repository>
   </repositories>
   <build>
     <extensions>
@@ -796,44 +786,6 @@ DO NOT MODIFIY - GENERATED CODE
         <jruby.versions>9.1.2.0</jruby.versions>
       </properties>
     </profile>
-    <profile>
-      <id>test-9.1.5.0</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <projectsDirectory>integration</projectsDirectory>
-                  <pomIncludes>
-                    <pomInclude>*/pom.xml</pomInclude>
-                  </pomIncludes>
-                  <streamLogs>true</streamLogs>
-                  <properties>
-                    <jruby.versions>${jruby.versions}</jruby.versions>
-                    <jruby.modes>${jruby.modes}</jruby.modes>
-                    <jruby.openssl.version>${project.version}</jruby.openssl.version>
-                    <bc.versions>${bc.versions}</bc.versions>
-                    <runit.dir>${runit.dir}</runit.dir>
-                  </properties>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <properties>
-        <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
-        <jruby.version>9.1.5.0</jruby.version>
-        <jruby.versions>9.1.5.0</jruby.versions>
-      </properties>
-    </profile>
     <profile>
       <id>test-9.1.8.0</id>
       <build>
@@ -911,7 +863,7 @@ DO NOT MODIFIY - GENERATED CODE
       </properties>
     </profile>
     <profile>
-      <id>test-9.1.13.0</id>
+      <id>test-9.1.16.0</id>
       <build>
         <plugins>
           <plugin>
@@ -944,12 +896,12 @@ DO NOT MODIFIY - GENERATED CODE
       </build>
       <properties>
         <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
-        <jruby.version>9.1.13.0</jruby.version>
-        <jruby.versions>9.1.13.0</jruby.versions>
+        <jruby.version>9.1.16.0</jruby.version>
+        <jruby.versions>9.1.16.0</jruby.versions>
       </properties>
     </profile>
     <profile>
-      <id>test-9.1.16.0</id>
+      <id>test-9.1.17.0</id>
       <build>
         <plugins>
           <plugin>
@@ -982,12 +934,12 @@ DO NOT MODIFIY - GENERATED CODE
       </build>
       <properties>
         <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
-        <jruby.version>9.1.16.0</jruby.version>
-        <jruby.versions>9.1.16.0</jruby.versions>
+        <jruby.version>9.1.17.0</jruby.version>
+        <jruby.versions>9.1.17.0</jruby.versions>
       </properties>
     </profile>
     <profile>
-      <id>test-9.1.17.0</id>
+      <id>test-9.2.0.0</id>
       <build>
         <plugins>
           <plugin>
@@ -1020,8 +972,8 @@ DO NOT MODIFIY - GENERATED CODE
       </build>
       <properties>
         <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
-        <jruby.version>9.1.17.0</jruby.version>
-        <jruby.versions>9.1.17.0</jruby.versions>
+        <jruby.version>9.2.0.0</jruby.version>
+        <jruby.versions>9.2.0.0</jruby.versions>
       </properties>
     </profile>
     <profile>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: java
 authors:
 - Ola Bini
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -64,13 +64,8 @@ files:
 - Mavenfile
 - README.md
 - Rakefile
-- integration/1.47/pom.xml
-- integration/1.48/pom.xml
-- integration/1.49/pom.xml
-- integration/1.50/pom.xml
-- integration/Mavenfile
-- integration/pom.xml
 - lib/jopenssl.jar
+- lib/jopenssl/_compat23.rb
 - lib/jopenssl/load.rb
 - lib/jopenssl/version.rb
 - lib/jopenssl19/openssl.rb
@@ -108,7 +103,6 @@ files:
 - lib/jopenssl23/openssl/pkey.rb
 - lib/jopenssl23/openssl/ssl.rb
 - lib/jopenssl23/openssl/x509.rb
-- lib/jopenssl24.rb
 - lib/jruby-openssl.rb
 - lib/openssl.rb
 - lib/openssl/bn.rb
@@ -117,7 +111,7 @@ files:
 - lib/openssl/config.rb
 - lib/openssl/digest.rb
 - lib/openssl/pkcs12.rb
-- lib/openssl/pkcs7.rb
+- lib/openssl/pkcs5.rb
 - lib/openssl/pkey.rb
 - lib/openssl/ssl-internal.rb
 - lib/openssl/ssl.rb

data/integration/1.47/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>none</groupId>
-    <artifactId>base</artifactId>
-    <version>0</version>
-  </parent>
-  <artifactId>bouncy-castle</artifactId>
-  <version>1.47</version>
-  <properties>
-    <bc.version>${project.version}</bc.version>
-  </properties>
-</project>

data/integration/1.48/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>none</groupId>
-    <artifactId>base</artifactId>
-    <version>0</version>
-  </parent>
-  <artifactId>bouncy-castle</artifactId>
-  <version>1.48</version>
-  <properties>
-    <bc.version>${project.version}</bc.version>
-  </properties>
-</project>

data/integration/1.49/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>none</groupId>
-    <artifactId>base</artifactId>
-    <version>0</version>
-  </parent>
-  <artifactId>bouncy-castle</artifactId>
-  <version>1.49</version>
-  <properties>
-    <bc.version>${project.version}</bc.version>
-  </properties>
-</project>

data/integration/1.50/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>none</groupId>
-    <artifactId>base</artifactId>
-    <version>0</version>
-  </parent>
-  <artifactId>bouncy-castle</artifactId>
-  <version>1.50</version>
-  <properties>
-    <bc.version>${project.version}</bc.version>
-  </properties>
-</project>

data/integration/Mavenfile

@@ -1,57 +0,0 @@
-#-*- mode: ruby -*-
-
-id 'none:base:0'
-packaging :pom
-
-snapshot_repository :id => 'jruby', :url => 'http://ci.jruby.org/snapshots/maven'
-
-# TODO should be setup whenever a plugin uses gems
-plugin_repository :id => 'rubygems-releases', :url => 'http://rubygems-proxy.torquebox.org/releases'
-
-base_path = File.expand_path('..', File.dirname(__FILE__))
-bc_version = File.read("#{base_path}/lib/jopenssl/version.rb")[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
-
-properties( 'bc.version' => bc_version, # to satisfy maven
-            'jruby.openssl.version' => '0.9.7', # to satisfy maven
-            # use the gem-maven-plugin repo for the tests
-            'gem.home' => '${basedir}/../pkg/rubygems',
-            'gem.path' => '${basedir}/../pkg/rubygems',
-            'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readonly' => true,
-            'jruby.version' => '1.7.19', # for jruby-maven-plugins
-            'jruby.plugins.version' => '1.0.9' )
-
-jruby_plugin :gem, :gemHomes => { 'gem-maven-plugin' => '${gem.home}' } do
-  execute_goal :initialize
-
-  gem 'jar-dependencies', '0.1.8' # TODO change after 0.1.15 is out
-  spec = Gem::Specification.load "#{base_path}/jruby-openssl.gemspec"
-  spec.development_dependencies.each do |dev_spec|
-    gem dev_spec.name, *dev_spec.requirements_list
-  end
-
-  # make sure we have those in the local repo
-  # BUT not be part of the runit-classloader
-  # otherwise jruby-1.7.x and jruby-1.6.x will not use those
-  # required in the test_*.rb files
-  jar  'org.bouncycastle', 'bcpkix-jdk15on', '${bc.version}'
-  jar  'org.bouncycastle', 'bcprov-jdk15on', '${bc.version}'
-  #spec.requirements.each do |req|
-  #  req = req.sub('jar', '').split(',').each(&:strip!)
-  #  jar req[0], req[1]
-  #end
-
-  gem 'jruby-openssl', '${jruby.openssl.version}'
-
-end
-
-jruby_plugin :runit do
-  execute_goal( :test,
-                :env => { 'BC_VERSION' => '${bc.version}' },
-                :jrubySwitches => '-I../../lib',
-                :runitDirectory => '../../src/test/ruby/**/test_*.rb',
-                :versions => '${jruby.versions}',
-                :modes => '${jruby.modes}' )
-end
-
-# vim: syntax=Ruby

data/integration/pom.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>none</groupId>
-  <artifactId>base</artifactId>
-  <version>0</version>
-  <packaging>pom</packaging>
-  <name>integration</name>
-  <properties>
-    <jruby.version>1.7.19</jruby.version>
-    <tesla.dump.readonly>true</tesla.dump.readonly>
-    <jruby.openssl.version>0.9.7</jruby.openssl.version>
-    <gem.path>${basedir}/../pkg/rubygems</gem.path>
-    <jruby.plugins.version>1.0.9</jruby.plugins.version>
-    <gem.home>${basedir}/../pkg/rubygems</gem.home>
-    <bc.version>1.50</bc.version>
-    <tesla.dump.pom>pom.xml</tesla.dump.pom>
-  </properties>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>jruby</id>
-      <url>http://ci.jruby.org/snapshots/maven</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-maven-plugin</artifactId>
-        <version>${jruby.plugins.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>initialize</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>rubygems</groupId>
-            <artifactId>jar-dependencies</artifactId>
-            <version>0.1.8</version>
-            <type>gem</type>
-          </dependency>
-          <dependency>
-            <groupId>rubygems</groupId>
-            <artifactId>jar-dependencies</artifactId>
-            <version>[0.1.0,0.1.99999]</version>
-            <type>gem</type>
-          </dependency>
-          <dependency>
-            <groupId>rubygems</groupId>
-            <artifactId>mocha</artifactId>
-            <version>[1.1.0,1.1.99999]</version>
-            <type>gem</type>
-          </dependency>
-          <dependency>
-            <groupId>rubygems</groupId>
-            <artifactId>ruby-maven</artifactId>
-            <version>[0,)</version>
-            <type>gem</type>
-          </dependency>
-          <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>${bc.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bc.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>rubygems</groupId>
-            <artifactId>jruby-openssl</artifactId>
-            <version>${jruby.openssl.version}</version>
-            <type>gem</type>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <gemHomes>
-            <gem-maven-plugin>${gem.home}</gem-maven-plugin>
-          </gemHomes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>runit-maven-plugin</artifactId>
-        <version>${jruby.plugins.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <env>
-                <BC_VERSION>${bc.version}</BC_VERSION>
-              </env>
-              <jrubySwitches>-I../../lib</jrubySwitches>
-              <runitDirectory>../../src/test/ruby/**/test_*.rb</runitDirectory>
-              <versions>${jruby.versions}</versions>
-              <modes>${jruby.modes}</modes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>