Upgrade BouncyCastle to 1.72

Migrate to artifact names used by 1.71+

12 files changed, 27 insertions, 22 deletions

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 17b7c7b8995..10f66d355b9 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -21,7 +21,7 @@
 
         <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml -->
         <athenz.version>1.10.54</athenz.version>
-        <bouncycastle.version>1.68</bouncycastle.version>
+        <bouncycastle.version>1.72</bouncycastle.version>
         <felix.version>7.0.1</felix.version>
         <httpclient5.version>5.1.3</httpclient5.version>
         <httpclient.version>4.5.13</httpclient.version>
@@ -195,8 +195,9 @@
                                         <include>org.apache.httpcomponents:httpmime:${httpclient.version}:jar:test</include>
                                         <include>org.apache.opennlp:opennlp-tools:1.9.3:jar:test</include>
                                         <include>org.apiguardian:apiguardian-api:1.1.0:jar:test</include>
-                                        <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:test</include>
-                                        <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:test</include>
+                                        <include>org.bouncycastle:bcpkix-jdk18on:[${bouncycastle.version}]:jar:test</include>
+                                        <include>org.bouncycastle:bcprov-jdk18on:[${bouncycastle.version}]:jar:test</include>
+                                        <include>org.bouncycastle:bcutil-jdk18on:[${bouncycastle.version}]:jar:test</include>
                                         <include>org.eclipse.jetty.alpn:alpn-api:[${jetty-alpn.version}]:jar:test</include>
                                         <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include>
                                         <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include>
diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml
index 476f5f99b86..e241f50e851 100644
--- a/config-proxy/pom.xml
+++ b/config-proxy/pom.xml
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 273270b208b..173979fbe81 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -195,11 +195,11 @@
                 hosted-zone-api-jar-with-dependencies.jar,
                 container-apache-http-client-bundle-jar-with-dependencies.jar,
                 security-utils.jar,
-                bcprov-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
+                bcprov-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
+                bcpkix-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
+                bcutil-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
                 <!-- END Bundles needed to retrieve config, or used by container-disc -->
 
-                bcpkix-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
-
                 jackson-annotations-${jackson2.version}.jar,
                 jackson-core-${jackson2.version}.jar,
                 jackson-databind-${jackson-databind.version}.jar,
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 65418f75ae2..100fe749394 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -32,7 +32,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
+          <artifactId>*</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -40,7 +40,7 @@
          in provided scope when container-test is declared before, and together with, the container artifact -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
     </dependency>
 
     <!-- All dependencies that should be visible in test classpath, but not compile classpath,
diff --git a/container/pom.xml b/container/pom.xml
index 966d8d49f5a..10322758d1a 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -24,7 +24,7 @@
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
+          <artifactId>*</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.ow2.asm</groupId>
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 3ddb0e24a33..5982c81e591 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -840,8 +840,7 @@ fi
 %dir %{_prefix}/lib
 %dir %{_prefix}/lib/jars
 %{_prefix}/lib/jars/application-model-jar-with-dependencies.jar
-%{_prefix}/lib/jars/bcpkix-jdk15on-*.jar
-%{_prefix}/lib/jars/bcprov-jdk15on-*.jar
+%{_prefix}/lib/jars/bc*-jdk18on-*.jar
 %{_prefix}/lib/jars/config-bundle-jar-with-dependencies.jar
 %{_prefix}/lib/jars/configdefinitions-jar-with-dependencies.jar
 %{_prefix}/lib/jars/config-model-api-jar-with-dependencies.jar
diff --git a/jrt/pom.xml b/jrt/pom.xml
index c4fb87d24c4..b43c2b3899c 100644
--- a/jrt/pom.xml
+++ b/jrt/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency> <!-- required due to bug in maven dependency resolving - bouncycastle is compile scope in security-utils, yet it is not part of test scope here -->
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index bdae6642093..e5b14472358 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -791,12 +791,17 @@
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
+                <artifactId>bcpkix-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcutil-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
@@ -1024,7 +1029,7 @@
                  find zkfacade/src/main/java/org/apache/curator -name package-info.java | \
                      xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g'
         -->
-        <bouncycastle.version>1.68</bouncycastle.version>
+        <bouncycastle.version>1.72</bouncycastle.version>
         <curator.version>5.3.0</curator.version>
         <commons.codec.version>1.15</commons.codec.version>
         <commons.math3.version>3.6.1</commons.math3.version>
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index 71920327fbb..a6f0040509c 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -24,7 +24,7 @@
     <!-- compile scope -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
index c01de58987c..e184d982790 100644
--- a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
+++ b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
@@ -2,7 +2,7 @@
 package com.yahoo.security;
 
 import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.DERIA5String;
+import org.bouncycastle.asn1.ASN1IA5String;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.GeneralName;
@@ -60,7 +60,7 @@ public class SubjectAlternativeName {
             case GeneralName.rfc822Name:
             case GeneralName.dNSName:
             case GeneralName.uniformResourceIdentifier:
-                return DERIA5String.getInstance(name).getString();
+                return ASN1IA5String.getInstance(name).getString();
             case GeneralName.directoryName:
                 return X500Name.getInstance(name).toString();
             case GeneralName.iPAddress:
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 55482dd1fed..758a99b38b9 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -92,7 +92,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
+                    <artifactId>*</artifactId>
                 </exclusion>
                 <!--Exclude all Jackson bundles provided by JDisc -->
                 <exclusion>
@@ -148,7 +148,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
+                    <artifactId>*</artifactId>
                 </exclusion>
                 <!--Exclude all Jackson bundles provided by JDisc -->
                 <exclusion>
diff --git a/vespa-feed-client/pom.xml b/vespa-feed-client/pom.xml
index 8b7b82573c4..1cc2f2adee1 100644
--- a/vespa-feed-client/pom.xml
+++ b/vespa-feed-client/pom.xml
@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>