3d21de4f85
* RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage * RH2090378: Revert to disabling system security properties and FIPS mode support together Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch Enable system security properties in the RPM (now disabled by default in the FIPS repo) Improve security properties test to check both enabled and disabled behaviour Run security properties test with property debugging on
13 lines
494 B
Diff
13 lines
494 B
Diff
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
|
|
index 474fe6f401f..7e94ae32023 100644
|
|
--- a/src/java.base/share/conf/security/java.security
|
|
+++ b/src/java.base/share/conf/security/java.security
|
|
@@ -84,6 +84,7 @@ security.provider.tbd=Apple
|
|
#ifndef solaris
|
|
security.provider.tbd=SunPKCS11
|
|
#endif
|
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
|
|
|
#
|
|
# Security providers used when FIPS mode support is active
|