Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FIPS API libraries of Bouncy Castle #1853

Merged
merged 4 commits into from
Jan 6, 2022
Merged

Update FIPS API libraries of Bouncy Castle #1853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8918ac
Update bc-fips to 1.0.2.1
tlfeng Jan 5, 2022
c16335a
Update bcpg-fips to 1.0.5.1
tlfeng Jan 5, 2022
7171d63
Update bctls-fips to 1.0.12.2
tlfeng Jan 5, 2022
108e2ad
Use the unified bouncycastle version for bcpkix-jdk15on in HDFS testi…
tlfeng Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions distribution/tools/plugin-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3110169183fc532d00f0930f2b5901672515eb7c
1 change: 0 additions & 1 deletion distribution/tools/plugin-cli/licenses/bc-fips-1.0.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.4.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions distribution/tools/plugin-cli/licenses/bcpg-fips-1.0.5.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
63a454936d930fadb1c7a3206b8e758378dd0a26
4 changes: 2 additions & 2 deletions gradle/fips.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/hdfs-fixture/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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'
Expand Down