Address review comments

ibmruntimes · Apr 16, 2024 · 4a5675c · 4a5675c
1 parent ff115c3
commit 4a5675c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java b/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java
@@ -133,7 +133,7 @@ public String[] run() {
  isFIPSSupported = isNSSSupported;
 
  userEnabledFIPS = Boolean.parseBoolean(props[0]);
- allowSetSecurityProps = Boolean.parseBoolean(props[4]);
+ allowSetProperties = Boolean.parseBoolean(props[4]);
 
  if (userEnabledFIPS) {
  if (isFIPSSupported) {
@@ -393,7 +393,7 @@ private static void checkFIPSCompatibility(Properties props) {
  */
  public static void checkSetSecurityProperty(String key) {
  if (debug != null) {
- debug.println("RestrictedSecurity: Checking whether security property '"
+ debug.println("RestrictedSecurity: Checking whether property '"
  + key + "' can be set.");
  }
 
@@ -403,10 +403,9 @@ public static void checkSetSecurityProperty(String key) {
  *
  * Allow any change, if the 'semeru.fips.allowsetproperties' flag is set to true.
  */
- if (userEnabledFIPS && !allowSetSecurityProps && unmodifiableProperties.contains(key)) {
+ if (unmodifiableProperties.contains(key)) {
  if (debug != null) {
- debug.println("RestrictedSecurity: Property '"
- + key + "' cannot be set.");
+ debug.println("RestrictedSecurity: Property '" + key + "' cannot be set.");
  debug.println("If you want to override the check and allow all security"
  + "properties to be set, use '-Dsemeru.fips.allowsetproperties=true'.");
  debug.println("BEWARE: You might not be FIPS compliant if you select to override!");