浏览代码

Bump bc-fips to 1.0.2.6 (#133290) (#133511)

Bump BC-JFA (bc-fips) to version 1.0.2.6

Backport of: #133198
Tim Vernum 1 月之前
父节点
当前提交
f82cdd4fc5

+ 2 - 2
build-tools-internal/src/main/groovy/elasticsearch.fips.gradle

@@ -25,11 +25,11 @@ if (buildParams.inFipsJvm) {
     File fipsSecurity = new File(fipsResourcesDir, javaSecurityFilename)
     File fipsPolicy = new File(fipsResourcesDir, 'fips_java.policy')
     File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
-    def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.5')
+    def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.6')
     def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19')
     def manualDebug = false; //change this to manually debug bouncy castle in an IDE
     if(manualDebug) {
-      bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:1.0.2.5')
+      bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:1.0.2.6')
       bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19'){
         exclude group: 'org.bouncycastle', module: 'bc-fips'  // to avoid jar hell
       }

+ 1 - 1
distribution/docker/build.gradle

@@ -129,7 +129,7 @@ dependencies {
   metricbeat_fips_aarch64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:linux-arm64@tar.gz"
   metricbeat_fips_x86_64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:linux-x86_64@tar.gz"
 
-  fips "org.bouncycastle:bc-fips:1.0.2.5"
+  fips "org.bouncycastle:bc-fips:1.0.2.6"
   fips "org.bouncycastle:bctls-fips:1.0.19"
 }
 

+ 1 - 1
distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

@@ -162,7 +162,7 @@ RUN printf "\\n" | jdk/bin/keytool -importkeystore \
   -deststorepass passwordcacert \
   -deststoretype BCFKS \
   -providerclass org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider \
-  -providerpath lib/bc-fips-1.0.2.5.jar \
+  -providerpath lib/bc-fips-1.0.2.6.jar \
   -destprovidername BCFIPS
 
 

+ 1 - 1
distribution/tools/plugin-cli/build.gradle

@@ -30,7 +30,7 @@ dependencies {
   implementation 'org.ow2.asm:asm-tree:9.7.1'
 
   api "org.bouncycastle:bcpg-fips:1.0.7.1"
-  api "org.bouncycastle:bc-fips:1.0.2.5"
+  api "org.bouncycastle:bc-fips:1.0.2.6"
   testImplementation project(":test:framework")
   testImplementation "com.google.jimfs:jimfs:${versions.jimfs}"
   testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"

+ 5 - 0
docs/changelog/133198.yaml

@@ -0,0 +1,5 @@
+pr: 133198
+summary: Bump bc-fips to 1.0.2.6
+area: FIPS
+type: upgrade
+issues: []

+ 6 - 6
gradle/verification-metadata.xml

@@ -3378,14 +3378,14 @@
             <sha256 value="5b8a26205f6d5ea60ad9ce65ce4a40a2afe4c48abeec61bd0740a088c24e89f5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bc-fips" version="1.0.2.5">
-         <artifact name="bc-fips-1.0.2.5.jar">
-            <sha256 value="50e4c7a0d0c68413d3d8587560d56945ac09e7c89c41bd971cd22d76be6f1085" origin="Generated by Gradle"/>
+      <component group="org.bouncycastle" name="bc-fips" version="1.0.2.6">
+         <artifact name="bc-fips-1.0.2.6.jar">
+            <sha256 value="ae2a1ece67e86d0c5b852765a9d04cdb05abc4ed7aa90b3bf3fbab786d3fedbc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bc-fips-debug" version="1.0.2.5">
-         <artifact name="bc-fips-debug-1.0.2.5.jar">
-            <sha256 value="5cfda7e020c5c1a3b1724386f139957472e551494254b8fc74e34f73590fc605" origin="Generated by Gradle"/>
+      <component group="org.bouncycastle" name="bc-fips-debug" version="1.0.2.6">
+         <artifact name="bc-fips-debug-1.0.2.6.jar">
+            <sha256 value="6ac85ac9a5fa5e4a003cadf5cae8e4e586deb4ac9b3209b87aa353f7c2b93379" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.bouncycastle" name="bcpg-fips" version="1.0.7.1">

+ 1 - 1
x-pack/plugin/core/build.gradle

@@ -65,7 +65,7 @@ dependencies {
   testImplementation project(path: ':modules:rest-root')
   testImplementation project(path: ':modules:health-shards-availability')
   // Needed for Fips140ProviderVerificationTests
-  testCompileOnly('org.bouncycastle:bc-fips:1.0.2.5')
+  testCompileOnly('org.bouncycastle:bc-fips:1.0.2.6')
 
   testImplementation(project(':x-pack:license-tools')) {
     transitive = false