Skip to content

Commit a47f4e6

Browse files
committed
Draft to allow run in FIPS compliace mode
Signed-off-by: Iwan Igonin <[email protected]> # Conflicts: # server/build.gradle
1 parent 4ad1be3 commit a47f4e6

40 files changed

+251
-1144
lines changed

build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ apply from: 'gradle/ide.gradle'
6565
apply from: 'gradle/forbidden-dependencies.gradle'
6666
apply from: 'gradle/formatting.gradle'
6767
apply from: 'gradle/local-distribution.gradle'
68-
apply from: 'gradle/fips.gradle'
6968
apply from: 'gradle/run.gradle'
7069
apply from: 'gradle/missing-javadoc.gradle'
7170
apply from: 'gradle/code-coverage.gradle'

buildSrc/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ dependencies {
123123
api 'org.jruby.joni:joni:2.2.1'
124124
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
125125
api "org.ajoberstar.grgit:grgit-core:5.2.1"
126+
api "org.bouncycastle:bc-fips:1.0.2.5"
127+
126128

127129
testFixturesApi "junit:junit:${props.getProperty('junit')}"
128130
testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"

buildSrc/src/main/java/org/opensearch/gradle/info/BuildParams.java

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class BuildParams {
5252
private static JavaVersion gradleJavaVersion;
5353
private static JavaVersion runtimeJavaVersion;
5454
private static String runtimeJavaDetails;
55+
@Deprecated
5556
private static Boolean inFipsJvm;
5657
private static String gitRevision;
5758
private static String gitOrigin;

buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java

+1
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,7 @@ private void createConfiguration() {
11871187
baseConfig.put("indices.breaker.total.use_real_memory", "false");
11881188
// Don't wait for state, just start up quickly. This will also allow new and old nodes in the BWC case to become the master
11891189
baseConfig.put("discovery.initial_state_timeout", "0s");
1190+
baseConfig.put("fips.approved", "true");
11901191

11911192
// TODO: Remove these once https://github.com/elastic/elasticsearch/issues/46091 is fixed
11921193
baseConfig.put("logger.org.opensearch.action.support.master", "DEBUG");
-101 KB
Binary file not shown.

buildSrc/src/main/resources/fips_java_bcjsse_11.policy

-29
This file was deleted.

buildSrc/src/main/resources/fips_java_bcjsse_8.policy

-34
This file was deleted.

buildSrc/src/main/resources/fips_java_bcjsse_8.security

-134
This file was deleted.

buildSrc/src/main/resources/fips_java_sunjsse.policy

-29
This file was deleted.

buildSrc/src/main/resources/fips_java_sunjsse.security

-134
This file was deleted.

0 commit comments

Comments
 (0)