upgrade bouncy castle (non-fips) to 1.78.1

jakelandis · May 2, 2024 · 06c1059 · 06c1059
1 parent 1bf9563
commit 06c1059
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -19,10 +19,8 @@ commons_lang3     = 3.9
 google_oauth_client = 1.34.1
 
 antlr4            = 4.13.1
-# when updating this version, you need to ensure compatibility with:
-#  - distribution/tools/plugin-cli
-#  - x-pack/plugin/security
-bouncycastle=1.76
+# bouncy castle version for non-fips. fips jars use a different version
+bouncycastle=1.78.1
 # used by security and idp (need to be in sync due to cross-dependency in testing)
 opensaml = 4.3.0
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3061,9 +3061,9 @@
             <sha256 value="a82ac5bc24bcbf6ba9eb70f334d6782e25245c8da36d9848ad553b5b7b68efd1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.76">
-         <artifact name="bcpkix-jdk18on-1.76.jar">
-            <sha256 value="935a388854c329f9a6f32708f30c90045d2f91294fa687281273145d4cf9834a" origin="Generated by Gradle"/>
+      <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.78.1">
+         <artifact name="bcpkix-jdk18on-1.78.1.jar">
+            <sha256 value="4b48ea084e5232b9d79ebca1887b9de037b124931807cd60710748c2aee08cc9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.60">
@@ -3076,19 +3076,19 @@
             <sha256 value="e469bd39f936999f256002631003ff022a22951da9d5bd9789c7abfa9763a292" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.76">
-         <artifact name="bcprov-jdk18on-1.76.jar">
-            <sha256 value="fda85d777aaae168015860b23a77cad9b8d3a1d5c904fda875313427bd560179" origin="Generated by Gradle"/>
+      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.78.1">
+         <artifact name="bcprov-jdk18on-1.78.1.jar">
+            <sha256 value="add5915e6acfc6ab5836e1fd8a5e21c6488536a8c1f21f386eeb3bf280b702d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.bouncycastle" name="bctls-fips" version="1.0.17">
          <artifact name="bctls-fips-1.0.17.jar">
             <sha256 value="51dfd28ec370f27ba4efc10ec8e21129e34e2f2340ac465a6d17a468e0a4696d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcutil-jdk18on" version="1.76">
-         <artifact name="bcutil-jdk18on-1.76.jar">
-            <sha256 value="1a65ad02958223a3f31373bd72eea942cafd1b1877a3ed0b492c2487e77c3c27" origin="Generated by Gradle"/>
+      <component group="org.bouncycastle" name="bcutil-jdk18on" version="1.78.1">
+         <artifact name="bcutil-jdk18on-1.78.1.jar">
+            <sha256 value="d9fa56f97b0f761ce3bc8d9d74c5d7137a987bf5bd3abfe1003f9bafa45a1d2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.carrot2" name="morfologik-fsa" version="2.1.1">

diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java
@@ -211,14 +211,14 @@ public void test50AutoConfigurationFailsWhenCertificatesNotGenerated() throws Ex
         FileUtils.assertPathsDoNotExist(installation.data);
         Path tempDir = createTempDir("bc-backup");
         Files.move(
-            installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.76.jar"),
-            tempDir.resolve("bcprov-jdk18on-1.76.jar")
+            installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.78.1.jar"),
+            tempDir.resolve("bcprov-jdk18on-1.78.1.jar")
         );
         Shell.Result result = runElasticsearchStartCommand(null, false, false);
         assertElasticsearchFailure(result, "java.lang.NoClassDefFoundError: org/bouncycastle/", null);
         Files.move(
-            tempDir.resolve("bcprov-jdk18on-1.76.jar"),
-            installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.76.jar")
+            tempDir.resolve("bcprov-jdk18on-1.78.1.jar"),
+            installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.78.1.jar")
         );
         Platforms.onWindows(() -> sh.chown(installation.config));
         FileUtils.rm(tempDir);