[deps] upgrade BC to latest 1.71

Author: kares

jruby-openssl.gemspec

@@ -27,9 +27,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}" # Provider
-  s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}" # PKIX/CMS/EAC/PKCSOCSP/TSP/OPENSSL
-  s.requirements << "jar org.bouncycastle:bctls-jdk15on,  #{bc_version}" # DTLS/TLS API/JSSE Provider
+  s.requirements << "jar org.bouncycastle:bcprov-jdk18on, #{bc_version}" # Provider
+  s.requirements << "jar org.bouncycastle:bcpkix-jdk18on, #{bc_version}" # PKIX/CMS/EAC/PKCSOCSP/TSP/OPENSSL
+  s.requirements << "jar org.bouncycastle:bctls-jdk18on,  #{bc_version}" # DTLS/TLS API/JSSE Provider
+  s.requirements << "jar org.bouncycastle:bcutil-jdk18on, #{bc_version}"
+
 end
 
 # vim: syntax=Ruby

lib/jopenssl/load.rb

@@ -8,22 +8,19 @@
   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
-    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
+    require_jar 'org.bouncycastle', 'bcprov-jdk18on', version
+    require_jar 'org.bouncycastle', 'bcpkix-jdk18on', version
+    require_jar 'org.bouncycastle', 'bcutil-jdk18on', version
+    require_jar 'org.bouncycastle', 'bctls-jdk18on',  version
     bc_jars = true
   rescue LoadError, RuntimeError
     bc_jars = false
   end
   unless bc_jars
-    load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
-    load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
-    load "org/bouncycastle/bctls-jdk15on/#{version}/bctls-jdk15on-#{version}.jar"
+    load "org/bouncycastle/bcprov-jdk18on/#{version}/bcprov-jdk18on-#{version}.jar"
+    load "org/bouncycastle/bcpkix-jdk18on/#{version}/bcpkix-jdk18on-#{version}.jar"
+    load "org/bouncycastle/bcutil-jdk18on/#{version}/bcutil-jdk18on-#{version}.jar"
+    load "org/bouncycastle/bctls-jdk18on/#{version}/bctls-jdk18on-#{version}.jar"
   end
 end
 

lib/jopenssl/version.rb

@@ -1,6 +1,6 @@
 module JOpenSSL
-  VERSION = '0.13.1.dev'
-  BOUNCY_CASTLE_VERSION = '1.68'
+  VERSION = '0.14.0.dev'
+  BOUNCY_CASTLE_VERSION = '1.71'
 end
 
 Object.class_eval do

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.13.1.dev-SNAPSHOT</version>
+  <version>0.14.0.dev-SNAPSHOT</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>
@@ -60,7 +60,7 @@ DO NOT MODIFY - GENERATED CODE
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <bc.versions>1.68</bc.versions>
+    <bc.versions>1.71</bc.versions>
     <invoker.skip>${maven.test.skip}</invoker.skip>
     <invoker.test>${bc.versions}</invoker.test>
     <jruby.plugins.version>2.0.1</jruby.plugins.version>
@@ -76,18 +76,23 @@ DO NOT MODIFY - GENERATED CODE
   <dependencies>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.68</version>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.71</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.68</version>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>1.71</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bctls-jdk15on</artifactId>
-      <version>1.68</version>
+      <artifactId>bctls-jdk18on</artifactId>
+      <version>1.71</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk18on</artifactId>
+      <version>1.71</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>

src/main/java/org/jruby/ext/openssl/PKeyEC.java

@@ -424,7 +424,7 @@ public IRubyObject dsa_sign_asn1(final ThreadContext context, final IRubyObject
 //            System.arraycopy(s, 0, encoded, i, s.length);
 
             ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-            ASN1OutputStream asn1 = new ASN1OutputStream(bytes);
+            ASN1OutputStream asn1 = ASN1OutputStream.create(bytes);
 
             ASN1EncodableVector v = new ASN1EncodableVector();
             v.add(new ASN1Integer(signature[0])); // r

src/main/java/org/jruby/ext/openssl/impl/PKey.java

@@ -284,8 +284,8 @@ public static KeyPair readECPrivateKey(final byte[] input)
     public static KeyPair readECPrivateKey(final KeyFactory ecFactory, final byte[] input)
         throws IOException, InvalidKeySpecException {
         try {
-            ECPrivateKeyStructure pKey = new ECPrivateKeyStructure((ASN1Sequence) ASN1Primitive.fromByteArray(input));
-            AlgorithmIdentifier   algId = new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, pKey.getParameters());
+            org.bouncycastle.asn1.sec.ECPrivateKey pKey = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(ASN1Primitive.fromByteArray(input));
+            AlgorithmIdentifier   algId = new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, pKey.getParametersObject().toASN1Primitive());
             PrivateKeyInfo        privInfo = new PrivateKeyInfo(algId, pKey.toASN1Primitive());
             SubjectPublicKeyInfo  pubInfo = new SubjectPublicKeyInfo(algId, pKey.getPublicKey().getBytes());
             PKCS8EncodedKeySpec   privSpec = new PKCS8EncodedKeySpec(privInfo.getEncoded());

src/main/java/org/jruby/ext/openssl/x509store/PEMInputOutput.java

@@ -1004,7 +1004,7 @@ public static void writeDSAPrivateKey(Writer _out, DSAPrivateKey obj, CipherSpec
         BufferedWriter out = makeBuffered(_out);
         PrivateKeyInfo info = PrivateKeyInfo.getInstance(new ASN1InputStream(getEncoded(obj)).readObject());
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ASN1OutputStream aOut = new ASN1OutputStream(bOut);
+        ASN1OutputStream aOut = ASN1OutputStream.create(bOut);
 
         DSAParameter p = DSAParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters());
         ASN1EncodableVector v = new ASN1EncodableVector();
@@ -1156,7 +1156,7 @@ public static void writeDHParameters(Writer _out, DHParameterSpec params) throws
         }
 
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ASN1OutputStream aOut = new ASN1OutputStream(bOut);
+        ASN1OutputStream aOut = ASN1OutputStream.create(bOut);
 
         aOut.writeObject(new DLSequence(v));