update all BC libraries to support JAVA 21

Signed-off-by: Iwan Igonin <[email protected]>
opensearch-project · Aug 8, 2024 · fd825eb · fd825eb
1 parent dc753b0
commit fd825eb
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 34 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -54,10 +54,11 @@ reactivestreams   = 1.0.4
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
 #  - distribution/tools/plugin-cli
-bouncycastle_jce=1.0.2.4
-bouncycastle_tls=1.0.19
-bouncycastle_pkix=1.0.7
-bouncycastle_pg=1.0.8
+bouncycastle_jce=2.0.0
+bouncycastle_tls=2.0.19
+bouncycastle_pkix=2.0.7
+bouncycastle_pg=2.0.8
+bouncycastle_util=2.0.3
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.13.2

diff --git a/client/rest/build.gradle b/client/rest/build.gradle
@@ -53,6 +53,7 @@ dependencies {
   api "org.slf4j:slf4j-api:${versions.slf4j}"
   api "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
   api "org.bouncycastle:bctls-fips:${versions.bouncycastle_tls}"
+  api "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
 
   // reactor
   api "io.projectreactor:reactor-core:${versions.reactor}"
@@ -147,18 +148,6 @@ thirdPartyAudit {
       'reactor.blockhound.integration.BlockHoundIntegration'
    )
    ignoreViolations(
-      'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider$CoreSecureRandom',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$BaseTLSKeyGeneratorSpi',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator$2',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator$2',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSPRFKeyGenerator',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator$2',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator',
-      'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator$2',
       'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
    )
 }

diff --git a/client/rest/licenses/bc-fips-1.0.2.4.jar.sha1 b/client/rest/licenses/bc-fips-1.0.2.4.jar.sha1
diff --git a/client/rest/licenses/bc-fips-2.0.0.jar.sha1 b/client/rest/licenses/bc-fips-2.0.0.jar.sha1
@@ -0,0 +1 @@
+ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab
diff --git a/client/rest/licenses/bctls-fips-1.0.19.jar.sha1 b/client/rest/licenses/bctls-fips-1.0.19.jar.sha1
diff --git a/client/rest/licenses/bctls-fips-2.0.19.jar.sha1 b/client/rest/licenses/bctls-fips-2.0.19.jar.sha1
@@ -0,0 +1 @@
+9cc33650ede63bc1a8281ed5c8e1da314d50bc76
diff --git a/client/rest/licenses/bcutil-fips-2.0.3.jar.sha1 b/client/rest/licenses/bcutil-fips-2.0.3.jar.sha1
@@ -0,0 +1 @@
+a1857cd639295b10cc90e6d31ecbc523cdafcc19
diff --git a/distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1
diff --git a/libs/ssl-config/build.gradle b/libs/ssl-config/build.gradle
@@ -38,6 +38,7 @@ dependencies {
   // bouncyCastle
   implementation "org.bouncycastle:bcpkix-fips:${versions.bouncycastle_pkix}"
   compileOnly "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
+  compileOnly "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
 
   testImplementation(project(":test:framework")) {
     exclude group: 'org.opensearch', module: 'opensearch-ssl-config'

diff --git a/libs/ssl-config/licenses/bcpkix-fips-1.0.7.jar.sha1 b/libs/ssl-config/licenses/bcpkix-fips-1.0.7.jar.sha1
diff --git a/libs/ssl-config/licenses/bcpkix-fips-2.0.7.jar.sha1 b/libs/ssl-config/licenses/bcpkix-fips-2.0.7.jar.sha1
@@ -0,0 +1 @@
+01eea0f325315ca6295b0a6926ff862d8001cdf9
diff --git a/server/build.gradle b/server/build.gradle
@@ -359,18 +359,6 @@ tasks.named("thirdPartyAudit").configure {
             'com.google.protobuf.UnsafeUtil$MemoryAccessor',
             'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
             'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1',
-            'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider$CoreSecureRandom',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$BaseTLSKeyGeneratorSpi',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSKeyMaterialGenerator$2',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSMasterSecretGenerator$2',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSPRFKeyGenerator',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSRsaPreMasterSecretGenerator$2',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator',
-            'org.bouncycastle.jcajce.provider.ProvSunTLSKDF$TLSExtendedMasterSecretGenerator$2',
             'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
     )
 }

diff --git a/server/licenses/bc-fips-1.0.2.4.jar.sha1 b/server/licenses/bc-fips-1.0.2.4.jar.sha1
diff --git a/server/licenses/bc-fips-2.0.0.jar.sha1 b/server/licenses/bc-fips-2.0.0.jar.sha1
@@ -0,0 +1 @@
+ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab
diff --git a/server/licenses/bctls-fips-1.0.19.jar.sha1 b/server/licenses/bctls-fips-1.0.19.jar.sha1
diff --git a/server/licenses/bctls-fips-2.0.19.jar.sha1 b/server/licenses/bctls-fips-2.0.19.jar.sha1
@@ -0,0 +1 @@
+9cc33650ede63bc1a8281ed5c8e1da314d50bc76