update

taoliult · Dec 4, 2024 · 08ae456 · 08ae456
1 parent 74a1a74
commit 08ae456
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/closed/test/jdk/openj9/internal/security/TestProviders.java b/closed/test/jdk/openj9/internal/security/TestProviders.java
@@ -47,28 +47,28 @@ private static Stream<Arguments> patternMatches_expectedExitValue0() {
         return Stream.of(
                 // Test strict profile provider list.
                 Arguments.of("TestBase.Version",
+                        System.getProperty("test.src") + "/provider-java.security",
+                        "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunJSSE)"),
+                // Test default profile provider list.
+                Arguments.of("TestBase",
+                        System.getProperty("test.src") + "/provider-java.security",
+                        "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)"
+                            + "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)"
+                            + "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
+                // Test extended profile provider list.
+                Arguments.of("TestBase.Version-Extended",
+                        System.getProperty("test.src") + "/provider-java.security",
+                        "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)"
+                            + "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)"
+                            + "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
+                // Test update provider list with value.
+                Arguments.of("Test-Profile.Updated_1",
+                        System.getProperty("test.src") + "/provider-java.security",
+                        "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunSASL)"),
+                // Test update provider list with null.
+                Arguments.of("Test-Profile.Updated_2",
                         System.getProperty("test.src") + "/provider-java.security",
                         "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunJSSE)")
-                // // Test default profile provider list.
-                // Arguments.of("TestBase",
-                //         System.getProperty("test.src") + "/provider-java.security",
-                //         "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)"
-                //             + "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)"
-                //             + "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
-                // // Test extended profile provider list.
-                // Arguments.of("TestBase.Version-Extended",
-                //         System.getProperty("test.src") + "/provider-java.security",
-                //         "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)"
-                //             + "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)"
-                //             + "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
-                // // Test update provider list with value.
-                // Arguments.of("Test-Profile.Updated_1",
-                //         System.getProperty("test.src") + "/provider-java.security",
-                //         "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunSASL)"),
-                // // Test update provider list with null.
-                // Arguments.of("Test-Profile.Updated_2",
-                //         System.getProperty("test.src") + "/provider-java.security",
-                //         "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunJSSE)")
         );
     }
 

diff --git a/closed/test/jdk/openj9/internal/security/property-java.security b/closed/test/jdk/openj9/internal/security/property-java.security
@@ -21,7 +21,7 @@
 RestrictedSecurity.TestBase.Version.desc.name = Test Base Profile
 RestrictedSecurity.TestBase.Version.desc.default = false
 RestrictedSecurity.TestBase.Version.desc.fips = true
-RestrictedSecurity.TestBase.Version.desc.hash = SHA256:24859dcd916c3d301c0a8d0a58f96f7c3a493cadad48ff1c91a5151f2cdd2d49
+RestrictedSecurity.TestBase.Version.desc.hash = SHA256:0ca32676ac2ae92d0469cbf293f3a69416c5d0312c80473319452f4d6995d234
 RestrictedSecurity.TestBase.Version.desc.number = Certificate #XXX
 RestrictedSecurity.TestBase.Version.desc.policy = https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/
 RestrictedSecurity.TestBase.Version.desc.sunsetDate = 2026-09-21