| diff --git openjdk.orig/src/java.base/share/classes/java/security/Security.java openjdk/src/java.base/share/classes/java/security/Security.java |
| |
| |
| @@ -32,6 +32,7 @@ |
| |
| import jdk.internal.event.EventHelper; |
| import jdk.internal.event.SecurityPropertyModificationEvent; |
| +import jdk.internal.misc.JavaSecuritySystemConfiguratorAccess; |
| import jdk.internal.misc.SharedSecrets; |
| import jdk.internal.util.StaticProperty; |
| import sun.security.util.Debug; |
| @@ -74,6 +75,15 @@ |
| } |
| |
| static { |
| + // Initialise here as used by code with system properties disabled |
| + SharedSecrets.setJavaSecuritySystemConfiguratorAccess( |
| + new JavaSecuritySystemConfiguratorAccess() { |
| + @Override |
| + public boolean isSystemFipsEnabled() { |
| + return SystemConfigurator.isSystemFipsEnabled(); |
| + } |
| + }); |
| + |
| // doPrivileged here because there are multiple |
| // things in initialize that might require privs. |
| // (the FileInputStream call and the File.exists call, |
| @@ -193,9 +203,8 @@ |
| } |
| |
| String disableSystemProps = System.getProperty("java.security.disableSystemPropertiesFile"); |
| - if (disableSystemProps == null && |
| - "true".equalsIgnoreCase(props.getProperty |
| - ("security.useSystemPropertiesFile"))) { |
| + if ((disableSystemProps == null || "false".equalsIgnoreCase(disableSystemProps)) && |
| + "true".equalsIgnoreCase(props.getProperty("security.useSystemPropertiesFile"))) { |
| if (SystemConfigurator.configure(props)) { |
| loadedProps = true; |
| } |
| diff --git openjdk.orig/src/java.base/share/classes/java/security/SystemConfigurator.java openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java |
| |
| |
| @@ -38,8 +38,6 @@ |
| import java.util.Properties; |
| import java.util.regex.Pattern; |
| |
| -import jdk.internal.misc.SharedSecrets; |
| -import jdk.internal.misc.JavaSecuritySystemConfiguratorAccess; |
| import sun.security.util.Debug; |
| |
| /** |
| @@ -65,16 +63,6 @@ |
| |
| private static boolean systemFipsEnabled = false; |
| |
| - static { |
| - SharedSecrets.setJavaSecuritySystemConfiguratorAccess( |
| - new JavaSecuritySystemConfiguratorAccess() { |
| - @Override |
| - public boolean isSystemFipsEnabled() { |
| - return SystemConfigurator.isSystemFipsEnabled(); |
| - } |
| - }); |
| - } |
| - |
| /* |
| * Invoked when java.security.Security class is initialized, if |
| * java.security.disableSystemPropertiesFile property is not set and |