Skip to content

Commit e505b10

Browse files
authored
Update FIPS API libraries of Bouncy Castle (#1853) (#1888)
* 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]>
1 parent afdaae4 commit e505b10

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

distribution/tools/plugin-cli/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ archivesBaseName = 'opensearch-plugin-cli'
3535
dependencies {
3636
compileOnly project(":server")
3737
compileOnly project(":libs:opensearch-cli")
38-
api "org.bouncycastle:bcpg-fips:1.0.4"
39-
api "org.bouncycastle:bc-fips:1.0.2"
38+
api "org.bouncycastle:bcpg-fips:1.0.5.1"
39+
api "org.bouncycastle:bc-fips:1.0.2.1"
4040
testImplementation project(":test:framework")
4141
testImplementation 'com.google.jimfs:jimfs:1.1'
4242
testRuntimeOnly 'com.google.guava:guava:18.0'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3110169183fc532d00f0930f2b5901672515eb7c

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

-1
This file was deleted.

distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.4.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
63a454936d930fadb1c7a3206b8e758378dd0a26

gradle/fips.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ if (BuildParams.inFipsJvm) {
3636
fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_11.policy")
3737
}
3838
File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
39-
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2')
40-
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.9')
39+
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2.1')
40+
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.12.2')
4141

4242
pluginManager.withPlugin('java') {
4343
TaskProvider<ExportOpenSearchBuildResourcesTask> fipsResourcesTask = project.tasks.register('fipsResources', ExportOpenSearchBuildResourcesTask)

test/fixtures/hdfs-fixture/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
3737
api "io.netty:netty-all:${versions.netty}"
3838
api 'com.google.code.gson:gson:2.8.9'
39-
api 'org.bouncycastle:bcpkix-jdk15on:1.69'
39+
api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
4040
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
4141
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
4242
api 'net.minidev:json-smart:2.4.7'

0 commit comments

Comments
 (0)