RH2048582: Support PKCS#12 keystores (#2)

franferrax · martinuy · gnu-andrew · commit 6daa538632a0 · 2023-08-18T02:47:00.000+01:00
* RH2048582: Support PKCS#12 keystores v16 This is superseded by 8301553: "Support Password-Based Cryptography in SunPKCS11" upstream Algorithms are now available both in and out of FIPS mode, as upstream * Change default keystore type for FIPS Align it with the non-FIPS keystore type (pkcs12) now that it is supported Co-authored-by: Martin Balao <mbalao@redhat.com> Reviewed-by: @gnu-andrew
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
@@ -308,7 +308,7 @@ keystore.type=pkcs12
 #
 # Default keystore type used when global crypto-policies are set to FIPS.
 #
-fips.keystore.type=PKCS11
+fips.keystore.type=pkcs12
 
 #
 # Controls compatibility mode for JKS and PKCS12 keystore types.

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ keystore.type=pkcs12`
`308`	`308`	`#`
`309`	`309`	`# Default keystore type used when global crypto-policies are set to FIPS.`
`310`	`310`	`#`
`311`		`-fips.keystore.type=PKCS11`
	`311`	`+fips.keystore.type=pkcs12`
`312`	`312`
`313`	`313`	`#`
`314`	`314`	`# Controls compatibility mode for JKS and PKCS12 keystore types.`