Skip to content

Commit bc3d82c

Browse files
richard-dennehyrichard-dennehy
committed
bump bc-fips to the latest version
1 parent 40cc718 commit bc3d82c

File tree

5 files changed

+34
-38
lines changed

5 files changed

+34
-38
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ if (buildParams.inFipsJvm) {
2323
File fipsSecurity = new File(fipsResourcesDir, javaSecurityFilename)
2424
File fipsPolicy = new File(fipsResourcesDir, 'fips_java.policy')
2525
File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
26-
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.5')
27-
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19')
26+
def bcFips = dependencies.create('org.bouncycastle:bc-fips:2.1.1')
27+
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:2.1.20')
2828
def manualDebug = false; //change this to manually debug bouncy castle in an IDE
2929
if(manualDebug) {
30-
bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:1.0.2.5')
31-
bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.19'){
30+
bcFips = dependencies.create('org.bouncycastle:bc-fips-debug:2.1.1')
31+
bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:2.1.20'){
3232
exclude group: 'org.bouncycastle', module: 'bc-fips' // to avoid jar hell
3333
}
3434
}

‎distribution/docker/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ 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"
133-
fips "org.bouncycastle:bctls-fips:1.0.19"
132+
fips "org.bouncycastle:bc-fips:2.1.1"
133+
fips "org.bouncycastle:bctls-fips:2.1.20"
134134
}
135135

136136
ext.expansions = { Architecture architecture, DockerBase base, String publicationContext = '' ->

‎distribution/tools/plugin-cli/build.gradle‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ dependencies {
2929
implementation 'org.ow2.asm:asm:9.7.1'
3030
implementation 'org.ow2.asm:asm-tree:9.7.1'
3131

32-
api "org.bouncycastle:bcpg-fips:1.0.7.1"
33-
api "org.bouncycastle:bc-fips:1.0.2.5"
32+
api "org.bouncycastle:bcpg-fips:2.1.11"
33+
api "org.bouncycastle:bc-fips:2.1.1"
3434
testImplementation project(":test:framework")
3535
testImplementation "com.google.jimfs:jimfs:${versions.jimfs}"
3636
testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"
@@ -50,32 +50,3 @@ tasks.named("test").configure {
5050
systemProperty 'java.security.egd', 'file:/dev/urandom'
5151
}
5252
}
53-
54-
/*
55-
* these two classes intentionally use the following JDK internal APIs in order to offer the necessary
56-
* functionality
57-
*
58-
* sun.security.internal.spec.TlsKeyMaterialParameterSpec
59-
* sun.security.internal.spec.TlsKeyMaterialSpec
60-
* sun.security.internal.spec.TlsMasterSecretParameterSpec
61-
* sun.security.internal.spec.TlsPrfParameterSpec
62-
* sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec
63-
* sun.security.provider.SecureRandom
64-
*
65-
*/
66-
tasks.named("thirdPartyAudit").configure {
67-
ignoreViolations(
68-
'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider$CoreSecureRandom',
69-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF',
70-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$BaseTLSKeyGeneratorSpi',
71-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator',
72-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator$2',
73-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator',
74-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator$2',
75-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSPRFKeyGenerator',
76-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator',
77-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator$2',
78-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator',
79-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator$2'
80-
)
81-
}

‎gradle/verification-metadata.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3491,16 +3491,31 @@
34913491
<sha256 value="50e4c7a0d0c68413d3d8587560d56945ac09e7c89c41bd971cd22d76be6f1085" origin="Generated by Gradle"/>
34923492
</artifact>
34933493
</component>
3494+
<component group="org.bouncycastle" name="bc-fips" version="2.1.1">
3495+
<artifact name="bc-fips-2.1.1.jar">
3496+
<sha256 value="a430d935ad6cec6d045930758457740f5a5f8f9715894e347f6800f7926a7321" origin="Generated by Gradle"/>
3497+
</artifact>
3498+
</component>
34943499
<component group="org.bouncycastle" name="bc-fips-debug" version="1.0.2.5">
34953500
<artifact name="bc-fips-debug-1.0.2.5.jar">
34963501
<sha256 value="5cfda7e020c5c1a3b1724386f139957472e551494254b8fc74e34f73590fc605" origin="Generated by Gradle"/>
34973502
</artifact>
34983503
</component>
3504+
<component group="org.bouncycastle" name="bc-fips-debug" version="2.1.1">
3505+
<artifact name="bc-fips-debug-2.1.1.jar">
3506+
<sha256 value="53719461ff7f00a2d6a50c8ac06093e82830c091610285e1725212041b783abb" origin="Generated by Gradle"/>
3507+
</artifact>
3508+
</component>
34993509
<component group="org.bouncycastle" name="bcpg-fips" version="1.0.7.1">
35003510
<artifact name="bcpg-fips-1.0.7.1.jar">
35013511
<sha256 value="fea1a096c098395eb67d48700c349d5f75321ef0c7c6af9198bc38f4cc836622" origin="Generated by Gradle"/>
35023512
</artifact>
35033513
</component>
3514+
<component group="org.bouncycastle" name="bcpg-fips" version="2.1.11">
3515+
<artifact name="bcpg-fips-2.1.11.jar">
3516+
<sha256 value="ea51efee825bd0d61c3d22cff5a127898edc7ca62ba454fbcf4789801031d850" origin="Generated by Gradle"/>
3517+
</artifact>
3518+
</component>
35043519
<component group="org.bouncycastle" name="bcpg-jdk15on" version="1.69">
35053520
<artifact name="bcpg-jdk15on-1.69.jar">
35063521
<sha256 value="a3984ff7fd9518d00094e34f3d3e714a4823f2505ada1c19b35c129e26f63934" origin="Generated by Gradle"/>
@@ -3536,6 +3551,16 @@
35363551
<sha256 value="a0bbad2eb5268f1baa08f0e2e69cb61cd292e19e73595c620d586d335d97d1a8" origin="Generated by Gradle"/>
35373552
</artifact>
35383553
</component>
3554+
<component group="org.bouncycastle" name="bctls-fips" version="2.1.20">
3555+
<artifact name="bctls-fips-2.1.20.jar">
3556+
<sha256 value="c058a438442ea46d8abdefc95e581ebf2834e50504bda925a945b1f4ceb48d86" origin="Generated by Gradle"/>
3557+
</artifact>
3558+
</component>
3559+
<component group="org.bouncycastle" name="bcutil-fips" version="2.1.4">
3560+
<artifact name="bcutil-fips-2.1.4.jar">
3561+
<sha256 value="e169519e6441fb19cabf633d44fcef211506793e5be499ac9215648bd20634e0" origin="Generated by Gradle"/>
3562+
</artifact>
3563+
</component>
35393564
<component group="org.bouncycastle" name="bcutil-jdk18on" version="1.78.1">
35403565
<artifact name="bcutil-jdk18on-1.78.1.jar">
35413566
<sha256 value="d9fa56f97b0f761ce3bc8d9d74c5d7137a987bf5bd3abfe1003f9bafa45a1d2f" origin="Generated by Gradle"/>

‎x-pack/plugin/core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070
testImplementation project(path: ':modules:rest-root')
7171
testImplementation project(path: ':modules:health-shards-availability')
7272
// Needed for Fips140ProviderVerificationTests
73-
testCompileOnly('org.bouncycastle:bc-fips:1.0.2.5')
73+
testCompileOnly('org.bouncycastle:bc-fips:2.1.1')
7474

7575
testImplementation(project(':x-pack:license-tools')) {
7676
transitive = false

0 commit comments

Comments
 (0)