Update FIPS API libraries of Bouncy Castle (opensearch-project#1853)

* Update bc-fips to 1.0.2.1 Signed-off-by: Tianli Feng <[email protected]> * Update bcpg-fips to 1.0.5.1 Signed-off-by: Tianli Feng <[email protected]> * Update bctls-fips to 1.0.12.2 Signed-off-by: Tianli Feng <[email protected]> * Use the unified bouncycastle version for bcpkix-jdk15on in HDFS testing fixture Signed-off-by: Tianli Feng <[email protected]>
tlfeng · Jan 11, 2022 · 06b20c5 · 06b20c5
1 parent 3f28311
commit 06b20c5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -35,8 +35,8 @@ archivesBaseName = 'opensearch-plugin-cli'
 dependencies {
   compileOnly project(":server")
   compileOnly project(":libs:opensearch-cli")
-  api "org.bouncycastle:bcpg-fips:1.0.4"
-  api "org.bouncycastle:bc-fips:1.0.2"
+  api "org.bouncycastle:bcpg-fips:1.0.5.1"
+  api "org.bouncycastle:bc-fips:1.0.2.1"
   testImplementation project(":test:framework")
   testImplementation 'com.google.jimfs:jimfs:1.1'
   testRuntimeOnly 'com.google.guava:guava:30.1.1-jre'

diff --git a/distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.1.jar.sha1
@@ -0,0 +1 @@
+3110169183fc532d00f0930f2b5901672515eb7c
diff --git a/distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.jar.sha1 b/distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.jar.sha1
diff --git a/distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.4.jar.sha1 b/distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.4.jar.sha1
diff --git a/distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.5.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.5.1.jar.sha1
@@ -0,0 +1 @@
+63a454936d930fadb1c7a3206b8e758378dd0a26
diff --git a/gradle/fips.gradle b/gradle/fips.gradle
@@ -36,8 +36,8 @@ if (BuildParams.inFipsJvm) {
       fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_11.policy")
     }
     File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
-    def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2')
-    def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.9')
+    def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.1')
+    def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.12.2')
 
     pluginManager.withPlugin('java') {
       TaskProvider<ExportOpenSearchBuildResourcesTask> fipsResourcesTask = project.tasks.register('fipsResources', ExportOpenSearchBuildResourcesTask)

diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -37,7 +37,7 @@ dependencies {
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api "io.netty:netty-all:${versions.netty}"
   api 'com.google.code.gson:gson:2.8.9'
-  api 'org.bouncycastle:bcpkix-jdk15on:1.69'
+  api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
   api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
   api 'net.minidev:json-smart:2.4.7'