Skip to content

Commit

Permalink
Remove test support for FIPS with JDK 8 (#77847)
Browse files Browse the repository at this point in the history
We now explicilty require JDK 11 and BC-FIPS for FIPS 140-2 mode. Both
periodic and PR CI jobs have been updated to only test for JDK 11 and
the latest JDK. As a result, the support for testing with JDK 8 is no
longer needed and this PR removes it.

Relates: #77736
  • Loading branch information
ywangd authored Oct 18, 2021
1 parent 48fc3cd commit 25b1020
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 302 deletions.
12 changes: 2 additions & 10 deletions build-tools-internal/src/main/groovy/elasticsearch.fips.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,9 @@ if (BuildParams.inFipsJvm) {

allprojects {
File fipsResourcesDir = new File(project.buildDir, 'fips-resources')
boolean java8 = BuildParams.runtimeJavaVersion == JavaVersion.VERSION_1_8
boolean oracle = BuildParams.runtimeJavaDetails.toLowerCase().contains('oracle')
File fipsSecurity;
File fipsPolicy;
if (java8) {
fipsSecurity = new File(fipsResourcesDir, oracle? "fips_java_bcjsse_oracle_8.security" : "fips_java_bcjsse_8.security")
fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_8.policy")
} else {
fipsSecurity = new File(fipsResourcesDir, oracle ? 'fips_java_oracle_11.security' : 'fips_java_bcjsse_11.security')
fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_11.policy")
}
File fipsSecurity = new File(fipsResourcesDir, oracle ? 'fips_java_oracle_11.security' : 'fips_java_bcjsse_11.security')
File 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')
Expand Down
23 changes: 0 additions & 23 deletions build-tools-internal/src/main/resources/fips_java_bcjsse_8.policy

This file was deleted.

134 changes: 0 additions & 134 deletions build-tools-internal/src/main/resources/fips_java_bcjsse_8.security

This file was deleted.

This file was deleted.

0 comments on commit 25b1020

Please sign in to comment.