Skip to content

Check for -Dorg.bouncycastle.fips.approved_only in testclusters to run with FIPS enforcement #20685

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

Merged
cwperks merged 4 commits into from
Feb 20, 2026
+5 −1
Merged

Check for -Dorg.bouncycastle.fips.approved_only in testclusters to run with FIPS enforcement #20685

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
c09fabc
Also check for -Dorg.bouncycastle.fips.approved_only in testclusters …
cwperks Feb 20, 2026
62fd04d
Address review comment
cwperks Feb 20, 2026
8eca0ed
Update buildSrc/src/main/java/org/opensearch/gradle/info/FipsBuildPar…
cwperks Feb 20, 2026
e8525f8
Spotless apply
cwperks Feb 20, 2026
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: 4 additions & 0 deletions buildSrc/src/main/java/org/opensearch/gradle/info/FipsBuildParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public static boolean isInFipsMode() {
return DEFAULT_FIPS_MODE.equals(fipsMode);
}

public static boolean isInFipsApprovedOnlyMode() {
return isInFipsMode() && "true".equals(System.getProperty("org.bouncycastle.fips.approved_only"));
}

public static String getFipsMode() {
return fipsMode;
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ public synchronized void start() {
logToProcessStdout("installed plugins");
}

if (FipsBuildParams.isInFipsMode() && keystorePassword.isEmpty()) {
if (FipsBuildParams.isInFipsApprovedOnlyMode() && keystorePassword.isEmpty()) {
throw new TestClustersException("Can not start " + this + " in FIPS JVM, missing keystore password");
}

Expand Down
Loading