From 1ecb9637b3a285aad9ef73f67731896b20634406 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Mon, 3 Jun 2024 14:40:27 +0300
Subject: [PATCH 1/2] [improve][misc] Upgrade Bouncycastle libraries to address
 CVEs

---
 bouncy-castle/bc/LICENSE                         | 6 +++---
 distribution/server/src/assemble/LICENSE.bin.txt | 8 ++++----
 distribution/shell/src/assemble/LICENSE.bin.txt  | 8 ++++----
 pom.xml                                          | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bouncy-castle/bc/LICENSE b/bouncy-castle/bc/LICENSE
index 14f4e76e921d3..f2860688be20f 100644
--- a/bouncy-castle/bc/LICENSE
+++ b/bouncy-castle/bc/LICENSE
@@ -205,6 +205,6 @@
 This projects includes binary packages with the following licenses:
 Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
-    - org.bouncycastle-bcpkix-jdk18on-1.78.jar
-    - org.bouncycastle-bcprov-jdk18on-1.78.jar
-    - org.bouncycastle-bcprov-ext-jdk18on-1.78.jar
+    - org.bouncycastle-bcpkix-jdk18on-1.78.1.jar
+    - org.bouncycastle-bcprov-jdk18on-1.78.1.jar
+    - org.bouncycastle-bcprov-ext-jdk18on-1.78.1.jar
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index e458200757167..784d4a889bb13 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -617,10 +617,10 @@ Creative Commons Attribution License
 
 Bouncy Castle License
  * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt
-    - org.bouncycastle-bcpkix-jdk18on-1.78.jar
-    - org.bouncycastle-bcprov-ext-jdk18on-1.78.jar
-    - org.bouncycastle-bcprov-jdk18on-1.78.jar
-    - org.bouncycastle-bcutil-jdk18on-1.78.jar
+    - org.bouncycastle-bcpkix-jdk18on-1.78.1.jar
+    - org.bouncycastle-bcprov-ext-jdk18on-1.78.1.jar
+    - org.bouncycastle-bcprov-jdk18on-1.78.1.jar
+    - org.bouncycastle-bcutil-jdk18on-1.78.1.jar
 
 ------------------------
 
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index be1f7db63134c..f3ca9e6b66ab0 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -474,10 +474,10 @@ Creative Commons Attribution License
 
 Bouncy Castle License
  * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt
-    - bcpkix-jdk18on-1.78.jar
-    - bcprov-ext-jdk18on-1.78.jar
-    - bcprov-jdk18on-1.78.jar
-    - bcutil-jdk18on-1.78.jar
+    - bcpkix-jdk18on-1.78.1.jar
+    - bcprov-ext-jdk18on-1.78.1.jar
+    - bcprov-jdk18on-1.78.1.jar
+    - bcutil-jdk18on-1.78.1.jar
 
 ------------------------
 
diff --git a/pom.xml b/pom.xml
index 347ef9e83c2c6..69d23f1793945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,9 +160,9 @@ flexible messaging model and an intuitive client API.</description>
     <slf4j.version>2.0.13</slf4j.version>
     <commons.collections4.version>4.4</commons.collections4.version>
     <log4j2.version>2.23.1</log4j2.version>
-    <bouncycastle.version>1.78</bouncycastle.version>
-    <bouncycastle.bcpkix-fips.version>1.0.6</bouncycastle.bcpkix-fips.version>
-    <bouncycastle.bc-fips.version>1.0.2.4</bouncycastle.bc-fips.version>
+    <bouncycastle.version>1.78.1</bouncycastle.version>
+    <bouncycastle.bcpkix-fips.version>1.0.7</bouncycastle.bcpkix-fips.version>
+    <bouncycastle.bc-fips.version>1.0.2.5</bouncycastle.bc-fips.version>
     <jackson.version>2.14.2</jackson.version>
     <reflections.version>0.10.2</reflections.version>
     <swagger.version>1.6.2</swagger.version>

From 95936294e799852c907328ba5eb1836e22f8586a Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Mon, 3 Jun 2024 15:55:42 +0300
Subject: [PATCH 2/2] Remove bcprov-ext-jdk18on since it has been relocated to
 bcprov-jdk18on

---
 bouncy-castle/bc/LICENSE                         | 1 -
 distribution/server/src/assemble/LICENSE.bin.txt | 1 -
 distribution/shell/src/assemble/LICENSE.bin.txt  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/bouncy-castle/bc/LICENSE b/bouncy-castle/bc/LICENSE
index f2860688be20f..c95d33d3d1ffb 100644
--- a/bouncy-castle/bc/LICENSE
+++ b/bouncy-castle/bc/LICENSE
@@ -207,4 +207,3 @@ Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
     - org.bouncycastle-bcpkix-jdk18on-1.78.1.jar
     - org.bouncycastle-bcprov-jdk18on-1.78.1.jar
-    - org.bouncycastle-bcprov-ext-jdk18on-1.78.1.jar
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 784d4a889bb13..cfee51da21d51 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -618,7 +618,6 @@ Creative Commons Attribution License
 Bouncy Castle License
  * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt
     - org.bouncycastle-bcpkix-jdk18on-1.78.1.jar
-    - org.bouncycastle-bcprov-ext-jdk18on-1.78.1.jar
     - org.bouncycastle-bcprov-jdk18on-1.78.1.jar
     - org.bouncycastle-bcutil-jdk18on-1.78.1.jar
 
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index f3ca9e6b66ab0..d3e58b999c5f2 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -475,7 +475,6 @@ Creative Commons Attribution License
 Bouncy Castle License
  * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt
     - bcpkix-jdk18on-1.78.1.jar
-    - bcprov-ext-jdk18on-1.78.1.jar
     - bcprov-jdk18on-1.78.1.jar
     - bcutil-jdk18on-1.78.1.jar