jruby-openssl 0.10.0-java → 0.10.5-java

metadata

@@ -1,60 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.5
 platform: java
 authors:
+- Karol Bucek
 - Ola Bini
 - JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  name: jar-dependencies
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  name: mocha
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  name: ruby-maven
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2020-10-01 00:00:00.000000000 Z
+dependencies: []
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
-email: ola.bini@gmail.com
+email: self+jruby-openssl@kares.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -64,13 +23,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 +62,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,15 +70,15 @@ 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
 - lib/openssl/x509-internal.rb
 - lib/openssl/x509.rb
-- lib/org/bouncycastle/bcpkix-jdk15on/1.59/bcpkix-jdk15on-1.59.jar
-- lib/org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.jar
-- lib/org/bouncycastle/bctls-jdk15on/1.59/bctls-jdk15on-1.59.jar
+- lib/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65.jar
+- lib/org/bouncycastle/bcprov-jdk15on/1.65/bcprov-jdk15on-1.65.jar
+- lib/org/bouncycastle/bctls-jdk15on/1.65/bctls-jdk15on-1.65.jar
 - pom.xml
 homepage: https://github.com/jruby/jruby-openssl
 licenses:
@@ -139,20 +92,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.4.8
 requirements:
-- jar org.bouncycastle:bcprov-jdk15on, 1.59
-- jar org.bouncycastle:bcpkix-jdk15on, 1.59
-- jar org.bouncycastle:bctls-jdk15on,  1.59
+- jar org.bouncycastle:bcprov-jdk15on, 1.65
+- jar org.bouncycastle:bcpkix-jdk15on, 1.65
+- jar org.bouncycastle:bctls-jdk15on,  1.65
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: JRuby OpenSSL

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>

data/lib/jopenssl24.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: false
-
-# Ruby 2.4 preliminary compatibility script, loaded after all (2.3) jruby-openssl files
-
-module OpenSSL
-
-  module SSL
-    class SSLContext
-      # OpenSSL 1.1.0 introduced "security level"
-      def security_level; 0 end
-      def security_level=(level); raise NotImplementedError end
-    end
-  end
-
-  module PKey
-
-    class DH
-
-      def set_key(pub_key, priv_key)
-        self.public_key = pub_key
-        self.priv_key = priv_key
-        self
-      end
-
-      def set_pqg(p, q, g)
-        self.p = p
-        # TODO self.q = q
-        if respond_to?(:q)
-          self.q = q
-        else
-          OpenSSL.warn "JRuby-OpenSSL does not support setting q param on #{inspect}" if q
-        end
-        self.g = g
-        self
-      end
-
-    end
-
-    class DSA
-
-      def set_key(pub_key, priv_key)
-        self.public_key = pub_key
-        self.priv_key = priv_key
-        self
-      end
-
-      def set_pqg(p, q, g)
-        self.p = p
-        self.q = q
-        self.g = g
-        self
-      end
-
-    end
-
-    class RSA
-
-      def set_key(n, e, d)
-        self.n = n
-        self.e = e
-        self.d = d
-        self
-      end
-
-      def set_factors(p, q)
-        self.p = p
-        self.q = q
-        self
-      end
-
-      def set_crt_params(dmp1, dmq1, iqmp)
-        self.dmp1 = dmp1
-        self.dmq1 = dmq1
-        self.iqmp = iqmp
-        self
-      end
-
-    end
-
-    # openssl/lib/openssl/pkey.rb :
-
-    class DH
-
-      remove_const :DEFAULT_512 if const_defined?(:DEFAULT_512)
-
-      DEFAULT_2048 = new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
-JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
-VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
-YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
-1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
-7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
------END DH PARAMETERS-----
-      _end_of_pem_
-
-    end
-
-    remove_const :DEFAULT_TMP_DH_CALLBACK if const_defined?(:DEFAULT_TMP_DH_CALLBACK)
-
-    DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen|
-      warn "using default DH parameters." if $VERBOSE
-      case keylen
-        when 1024 then OpenSSL::PKey::DH::DEFAULT_1024
-        when 2048 then OpenSSL::PKey::DH::DEFAULT_2048
-        else nil
-      end
-    }
-
-  end
-
-end