|
 |
97e098 |
diff -r 6efbd7b35a10 src/share/classes/java/security/SystemConfigurator.java
|
|
|
97e098 |
--- openjdk.orig/src/java.base/share/classes/java/security/SystemConfigurator.java Thu Jan 23 18:22:31 2020 -0300
|
|
|
97e098 |
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java Mon Mar 02 19:20:17 2020 -0300
|
|
|
97e098 |
@@ -123,6 +123,33 @@
|
|
|
97e098 |
}
|
|
|
97e098 |
props.put(fipsProviderKey, fipsProviderValue);
|
|
|
97e098 |
}
|
|
|
97e098 |
+ // Add other security properties
|
|
|
97e098 |
+ String keystoreTypeValue = (String) props.get("fips.keystore.type");
|
|
|
97e098 |
+ if (keystoreTypeValue != null) {
|
|
|
97e098 |
+ String nonFipsKeystoreType = props.getProperty("keystore.type");
|
|
|
97e098 |
+ props.put("keystore.type", keystoreTypeValue);
|
|
|
97e098 |
+ if (keystoreTypeValue.equals("PKCS11")) {
|
|
|
97e098 |
+ // If keystore.type is PKCS11, javax.net.ssl.keyStore
|
|
|
97e098 |
+ // must be "NONE". See JDK-8238264.
|
|
|
97e098 |
+ System.setProperty("javax.net.ssl.keyStore", "NONE");
|
|
|
97e098 |
+ }
|
|
|
97e098 |
+ if (System.getProperty("javax.net.ssl.trustStoreType") == null) {
|
|
|
97e098 |
+ // If no trustStoreType has been set, use the
|
|
|
97e098 |
+ // previous keystore.type under FIPS mode. In
|
|
|
97e098 |
+ // a default configuration, the Trust Store will
|
|
|
97e098 |
+ // be 'cacerts' (JKS type).
|
|
|
97e098 |
+ System.setProperty("javax.net.ssl.trustStoreType",
|
|
|
97e098 |
+ nonFipsKeystoreType);
|
|
|
97e098 |
+ }
|
|
|
97e098 |
+ if (sdebug != null) {
|
|
|
97e098 |
+ sdebug.println("FIPS mode default keystore.type = " +
|
|
|
97e098 |
+ keystoreTypeValue);
|
|
|
97e098 |
+ sdebug.println("FIPS mode javax.net.ssl.keyStore = " +
|
|
|
97e098 |
+ System.getProperty("javax.net.ssl.keyStore", ""));
|
|
|
97e098 |
+ sdebug.println("FIPS mode javax.net.ssl.trustStoreType = " +
|
|
|
97e098 |
+ System.getProperty("javax.net.ssl.trustStoreType", ""));
|
|
|
97e098 |
+ }
|
|
|
97e098 |
+ }
|
|
|
97e098 |
loadedProps = true;
|
|
|
97e098 |
}
|
|
|
97e098 |
} catch (Exception e) {
|
|
|
97e098 |
diff -r 6efbd7b35a10 src/share/lib/security/java.security-linux
|
|
|
97e098 |
--- openjdk.orig/src/java.base/share/conf/security/java.security Thu Jan 23 18:22:31 2020 -0300
|
|
|
97e098 |
+++ openjdk/src/java.base/share/conf/security/java.security Mon Mar 02 19:20:17 2020 -0300
|
|
|
97e098 |
@@ -299,6 +299,11 @@
|
|
|
97e098 |
keystore.type=pkcs12
|
|
|
97e098 |
|
|
|
97e098 |
#
|
|
|
97e098 |
+# Default keystore type used when global crypto-policies are set to FIPS.
|
|
|
97e098 |
+#
|
|
|
97e098 |
+fips.keystore.type=PKCS11
|
|
|
97e098 |
+
|
|
|
97e098 |
+#
|
|
|
97e098 |
# Controls compatibility mode for JKS and PKCS12 keystore types.
|
|
|
97e098 |
#
|
|
|
97e098 |
# When set to 'true', both JKS and PKCS12 keystore types support loading
|