Separate profiles for test team

JinhangZhang · Sep 20, 2024 · ef573cd · ef573cd
1 parent 6d1b21c
commit ef573cd
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/test/jdk/javax/net/ssl/TLSTest_java.security b/test/jdk/javax/net/ssl/TLSTest_java.security
@@ -1,17 +1,29 @@
-# Test-TLS Restricted Security mode profile for FIPS 140-3. This profile is a test profile that extends
+# Test-TLS-JKS Restricted Security mode profile for FIPS 140-3. This profile is a test profile that extends
 # OpenJCEPlusFIPS.FIPS140-3. This profile also includes non-cryptographic algorithms and common configuration
-# options such as, PKCS12, JKS from SUN and PBE related services from SunJCE.
+# options such as, JKS from SUN.
 #
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS.desc.name = Test-TLS OpenJCEPlusFIPS Cryptographic Module FIPS 140-3
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS.desc.default = false
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS.extends = RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS.desc.name = Test-TLS OpenJCEPlusFIPS Cryptographic Module FIPS 140-3
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS.desc.default = false
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS.extends = RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3
 
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS.jce.provider.2 = sun.security.provider.Sun [+ \
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS.jce.provider.2 = sun.security.provider.Sun [+ \
  {KeyStore, JKS, *}, \
- {KeyStore, PKCS12, *}, \
  {MessageDigest, SHA-1, *}]
 
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS.jce.provider.4 = com.sun.crypto.provider.SunJCE [{AlgorithmParameters, PBES2, *}, \
+# Test-TLS-PKCS12 Restricted Security mode profile for FIPS 140-3. This profile is a test profile that extends
+# OpenJCEPlusFIPS.FIPS140-3. This profile also includes non-cryptographic algorithms and common configuration
+# options such as, PKCS12 from SUN and PBE related services from SunJCE.
+#
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12.desc.name = Test-TLS OpenJCEPlusFIPS Cryptographic Module FIPS 140-3
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12.desc.default = false
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12.extends = RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3
+
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12.jce.provider.2 = sun.security.provider.Sun [+ \
+ {KeyStore, JKS, *}, \
+ {MessageDigest, SHA-1, *}, \
+ {KeyStore, PKCS12, *}]
+
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12.jce.provider.4 = com.sun.crypto.provider.SunJCE [{AlgorithmParameters, PBES2, *}, \
  {AlgorithmParameters, PBEWithHmacSHA256AndAES_256, *}, \
  {AlgorithmParameters, PBEWithMD5AndDES, *}, \
  {SecretKeyFactory, PBEWithMD5AndDES, *}, \