Skip to content

Commit 321929f

Browse files
iigoniniigonin
committed
update all BC libraries to support JAVA 21
Signed-off-by: Iwan Igonin <[email protected]>
1 parent 4fc6201 commit 321929f

17 files changed

+15
-34
lines changed

‎buildSrc/version.properties

+5-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ reactivestreams = 1.0.4
5555
# when updating this version, you need to ensure compatibility with:
5656
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
5757
# - distribution/tools/plugin-cli
58-
bouncycastle_jce=1.0.2.4
59-
bouncycastle_tls=1.0.19
60-
bouncycastle_pkix=1.0.7
61-
bouncycastle_pg=1.0.8
58+
bouncycastle_jce=2.0.0
59+
bouncycastle_tls=2.0.19
60+
bouncycastle_pkix=2.0.7
61+
bouncycastle_pg=2.0.8
62+
bouncycastle_util=2.0.3
6263
# test dependencies
6364
randomizedrunner = 2.7.1
6465
junit = 4.13.2

‎client/rest/build.gradle

+1-12
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ dependencies {
5353
api "org.slf4j:slf4j-api:${versions.slf4j}"
5454
api "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
5555
api "org.bouncycastle:bctls-fips:${versions.bouncycastle_tls}"
56+
api "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
5657

5758
// reactor
5859
api "io.projectreactor:reactor-core:${versions.reactor}"
@@ -147,18 +148,6 @@ thirdPartyAudit {
147148
'reactor.blockhound.integration.BlockHoundIntegration'
148149
)
149150
ignoreViolations(
150-
'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider$CoreSecureRandom',
151-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF',
152-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$BaseTLSKeyGeneratorSpi',
153-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator',
154-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator$2',
155-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator',
156-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator$2',
157-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSPRFKeyGenerator',
158-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator',
159-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator$2',
160-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator',
161-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator$2',
162151
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
163152
)
164153
}

‎client/rest/licenses/bc-fips-1.0.2.4.jar.sha1

-1
This file was deleted.

‎client/rest/licenses/bc-fips-2.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab

‎client/rest/licenses/bctls-fips-1.0.19.jar.sha1

-1
This file was deleted.

‎client/rest/licenses/bctls-fips-2.0.19.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9cc33650ede63bc1a8281ed5c8e1da314d50bc76

‎client/rest/licenses/bcutil-fips-2.0.3.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1857cd639295b10cc90e6d31ecbc523cdafcc19

‎distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1

-1
This file was deleted.

‎libs/ssl-config/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ dependencies {
3838
// bouncyCastle
3939
implementation "org.bouncycastle:bcpkix-fips:${versions.bouncycastle_pkix}"
4040
compileOnly "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
41+
compileOnly "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
4142

4243
testImplementation(project(":test:framework")) {
4344
exclude group: 'org.opensearch', module: 'opensearch-ssl-config'

‎libs/ssl-config/licenses/bcpkix-fips-1.0.7.jar.sha1

-1
This file was deleted.

‎libs/ssl-config/licenses/bcpkix-fips-2.0.7.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
01eea0f325315ca6295b0a6926ff862d8001cdf9

‎server/build.gradle

+1-12
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ dependencies {
132132
// bouncyCastle
133133
api "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
134134
api "org.bouncycastle:bctls-fips:${versions.bouncycastle_tls}"
135+
api "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
135136

136137
testImplementation(project(":test:framework")) {
137138
// tests use the locally compiled version of server
@@ -363,18 +364,6 @@ tasks.named("thirdPartyAudit").configure {
363364
'com.google.protobuf.UnsafeUtil$MemoryAccessor',
364365
'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
365366
'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1',
366-
'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider$CoreSecureRandom',
367-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF',
368-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$BaseTLSKeyGeneratorSpi',
369-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator',
370-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator$2',
371-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator',
372-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator$2',
373-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSPRFKeyGenerator',
374-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator',
375-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator$2',
376-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator',
377-
'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator$2',
378367
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
379368
)
380369
}

‎server/licenses/bc-fips-1.0.2.4.jar.sha1

-1
This file was deleted.

‎server/licenses/bc-fips-2.0.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab

‎server/licenses/bctls-fips-1.0.19.jar.sha1

-1
This file was deleted.

‎server/licenses/bctls-fips-2.0.19.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9cc33650ede63bc1a8281ed5c8e1da314d50bc76

‎server/licenses/bcutil-fips-2.0.3.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1857cd639295b10cc90e6d31ecbc523cdafcc19

0 commit comments

Comments
 (0)