Skip to content

Commit 25b1020

Browse files
authored
Remove test support for FIPS with JDK 8 (elastic#77847)
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: elastic#77736
1 parent 48fc3cd commit 25b1020

File tree

4 files changed

+2
-302
lines changed

4 files changed

+2
-302
lines changed

build-tools-internal/src/main/groovy/elasticsearch.fips.gradle

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,9 @@ if (BuildParams.inFipsJvm) {
1616

1717
allprojects {
1818
File fipsResourcesDir = new File(project.buildDir, 'fips-resources')
19-
boolean java8 = BuildParams.runtimeJavaVersion == JavaVersion.VERSION_1_8
2019
boolean oracle = BuildParams.runtimeJavaDetails.toLowerCase().contains('oracle')
21-
File fipsSecurity;
22-
File fipsPolicy;
23-
if (java8) {
24-
fipsSecurity = new File(fipsResourcesDir, oracle? "fips_java_bcjsse_oracle_8.security" : "fips_java_bcjsse_8.security")
25-
fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_8.policy")
26-
} else {
27-
fipsSecurity = new File(fipsResourcesDir, oracle ? 'fips_java_oracle_11.security' : 'fips_java_bcjsse_11.security')
28-
fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_11.policy")
29-
}
20+
File fipsSecurity = new File(fipsResourcesDir, oracle ? 'fips_java_oracle_11.security' : 'fips_java_bcjsse_11.security')
21+
File fipsPolicy = new File(fipsResourcesDir, "fips_java_bcjsse_11.policy")
3022
File fipsTrustStore = new File(fipsResourcesDir, 'cacerts.bcfks')
3123
def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.2')
3224
def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.9')

build-tools-internal/src/main/resources/fips_java_bcjsse_8.policy

Lines changed: 0 additions & 23 deletions
This file was deleted.

build-tools-internal/src/main/resources/fips_java_bcjsse_8.security

Lines changed: 0 additions & 134 deletions
This file was deleted.

build-tools-internal/src/main/resources/fips_java_bcjsse_oracle_8.security

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)