Skip to content

Commit

Permalink
Draft to allow run in FIPS compliace mode
Browse files Browse the repository at this point in the history
Signed-off-by: Iwan Igonin <[email protected]>
  • Loading branch information
iigonin committed Jul 23, 2024
1 parent 6267e94 commit 6016d5d
Show file tree
Hide file tree
Showing 40 changed files with 251 additions and 1,144 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ apply from: 'gradle/ide.gradle'
apply from: 'gradle/forbidden-dependencies.gradle'
apply from: 'gradle/formatting.gradle'
apply from: 'gradle/local-distribution.gradle'
apply from: 'gradle/fips.gradle'
apply from: 'gradle/run.gradle'
apply from: 'gradle/missing-javadoc.gradle'
apply from: 'gradle/code-coverage.gradle'
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ dependencies {
api 'org.jruby.joni:joni:2.2.1'
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
api "org.ajoberstar.grgit:grgit-core:5.2.1"
api "org.bouncycastle:bc-fips:1.0.2.5"


testFixturesApi "junit:junit:${props.getProperty('junit')}"
testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class BuildParams {
private static JavaVersion gradleJavaVersion;
private static JavaVersion runtimeJavaVersion;
private static String runtimeJavaDetails;
@Deprecated
private static Boolean inFipsJvm;
private static String gitRevision;
private static String gitOrigin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,7 @@ private void createConfiguration() {
baseConfig.put("indices.breaker.total.use_real_memory", "false");
// 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
baseConfig.put("discovery.initial_state_timeout", "0s");
baseConfig.put("fips.approved", "true");

// TODO: Remove these once https://github.com/elastic/elasticsearch/issues/46091 is fixed
baseConfig.put("logger.org.opensearch.action.support.master", "DEBUG");
Expand Down
Binary file removed buildSrc/src/main/resources/cacerts.bcfks
Binary file not shown.
29 changes: 0 additions & 29 deletions buildSrc/src/main/resources/fips_java_bcjsse_11.policy

This file was deleted.

34 changes: 0 additions & 34 deletions buildSrc/src/main/resources/fips_java_bcjsse_8.policy

This file was deleted.

134 changes: 0 additions & 134 deletions buildSrc/src/main/resources/fips_java_bcjsse_8.security

This file was deleted.

29 changes: 0 additions & 29 deletions buildSrc/src/main/resources/fips_java_sunjsse.policy

This file was deleted.

134 changes: 0 additions & 134 deletions buildSrc/src/main/resources/fips_java_sunjsse.security

This file was deleted.

Loading

0 comments on commit 6016d5d

Please sign in to comment.