Skip to content

Commit 015809d

Browse files
tvernumsarog
authored andcommitted
Bump bc-fips to 1.0.2.6 (elastic#133290) (elastic#133511)
Bump BC-JFA (bc-fips) to version 1.0.2.6 Backport of: elastic#133198
1 parent 0b2deb0 commit 015809d

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ if (buildParams.inFipsJvm) {
2525
File fipsSecurity = new File(fipsResourcesDir, javaSecurityFilename)
2626
File fipsPolicy = new File(fipsResourcesDir, 'fips_java.policy')
2727
File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
28-
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.5')
28+
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.6')
2929
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19')
3030
def manualDebug = false; //change this to manually debug bouncy castle in an IDE
3131
if(manualDebug) {
32-
bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:1.0.2.5')
32+
bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:1.0.2.6')
3333
bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19'){
3434
exclude group: 'org.bouncycastle', module: 'bc-fips' // to avoid jar hell
3535
}

distribution/docker/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ dependencies {
129129
metricbeat_fips_aarch64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:[email protected]"
130130
metricbeat_fips_x86_64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:[email protected]"
131131

132-
fips "org.bouncycastle:bc-fips:1.0.2.5"
132+
fips "org.bouncycastle:bc-fips:1.0.2.6"
133133
fips "org.bouncycastle:bctls-fips:1.0.19"
134134
}
135135

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ RUN printf "\\n" | jdk/bin/keytool -importkeystore \
162162
-deststorepass passwordcacert \
163163
-deststoretype BCFKS \
164164
-providerclass org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider \
165-
-providerpath lib/bc-fips-1.0.2.5.jar \
165+
-providerpath lib/bc-fips-1.0.2.6.jar \
166166
-destprovidername BCFIPS
167167

168168

distribution/tools/plugin-cli/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation 'org.ow2.asm:asm-tree:9.7.1'
3131

3232
api "org.bouncycastle:bcpg-fips:1.0.7.1"
33-
api "org.bouncycastle:bc-fips:1.0.2.5"
33+
api "org.bouncycastle:bc-fips:1.0.2.6"
3434
testImplementation project(":test:framework")
3535
testImplementation "com.google.jimfs:jimfs:${versions.jimfs}"
3636
testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"

docs/changelog/133198.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133198
2+
summary: Bump bc-fips to 1.0.2.6
3+
area: FIPS
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3378,14 +3378,14 @@
33783378
<sha256 value="5b8a26205f6d5ea60ad9ce65ce4a40a2afe4c48abeec61bd0740a088c24e89f5" origin="Generated by Gradle"/>
33793379
</artifact>
33803380
</component>
3381-
<component group="org.bouncycastle" name="bc-fips" version="1.0.2.5">
3382-
<artifact name="bc-fips-1.0.2.5.jar">
3383-
<sha256 value="50e4c7a0d0c68413d3d8587560d56945ac09e7c89c41bd971cd22d76be6f1085" origin="Generated by Gradle"/>
3381+
<component group="org.bouncycastle" name="bc-fips" version="1.0.2.6">
3382+
<artifact name="bc-fips-1.0.2.6.jar">
3383+
<sha256 value="ae2a1ece67e86d0c5b852765a9d04cdb05abc4ed7aa90b3bf3fbab786d3fedbc" origin="Generated by Gradle"/>
33843384
</artifact>
33853385
</component>
3386-
<component group="org.bouncycastle" name="bc-fips-debug" version="1.0.2.5">
3387-
<artifact name="bc-fips-debug-1.0.2.5.jar">
3388-
<sha256 value="5cfda7e020c5c1a3b1724386f139957472e551494254b8fc74e34f73590fc605" origin="Generated by Gradle"/>
3386+
<component group="org.bouncycastle" name="bc-fips-debug" version="1.0.2.6">
3387+
<artifact name="bc-fips-debug-1.0.2.6.jar">
3388+
<sha256 value="6ac85ac9a5fa5e4a003cadf5cae8e4e586deb4ac9b3209b87aa353f7c2b93379" origin="Generated by Gradle"/>
33893389
</artifact>
33903390
</component>
33913391
<component group="org.bouncycastle" name="bcpg-fips" version="1.0.7.1">

x-pack/plugin/core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
testImplementation project(path: ':modules:rest-root')
6666
testImplementation project(path: ':modules:health-shards-availability')
6767
// Needed for Fips140ProviderVerificationTests
68-
testCompileOnly('org.bouncycastle:bc-fips:1.0.2.5')
68+
testCompileOnly('org.bouncycastle:bc-fips:1.0.2.6')
6969

7070
testImplementation(project(':x-pack:license-tools')) {
7171
transitive = false

0 commit comments

Comments
 (0)