Test changes

Author: KostasTsiounis

closed/test/jdk/openj9/internal/security/TestConstraints.java

@@ -51,14 +51,13 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import openj9.internal.security.RestrictedSecurity;
 
 public class TestConstraints {
 
-    private static getInstances() {
+    private static void getInstances() {
         CertificateFactory.getInstance("X.509");
-        CertStore.getInstance("Collection");
-        Configuration.getInstance("JavaLoginConfig");
+        //CertStore.getInstance("Collection");
+        //Configuration.getInstance("JavaLoginConfig");
         CertPathValidator.getInstance("PKIX");
         MessageDigest.getInstance("SHA-256");
         KeyStore.getInstance("PKCS12");
@@ -83,7 +82,7 @@ private static getInstances() {
     @Test
     public void runWithConstraints() {
         OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
-                "-Dsemeru.customprofile=" + RestrictedSecurity.TestConstraints.Version,
+                "-Dsemeru.customprofile=RestrictedSecurity.TestConstraints.Version",
                 "-Djava.security.properties=" + System.getProperty("test.src") + "/constraints-java.security",
                 "TestProperties"
         );

closed/test/jdk/openj9/internal/security/constraints-java.security

@@ -46,12 +46,15 @@ RestrictedSecurity.TestConstraints.Version.jce.provider.3 = com.sun.crypto.provi
     {KDF, HKDF-SHA256, *, FullClassName:TestConstraints}, \
     {SecretKeyFactory, PBEWithMD5AndDES, *, FullClassName:TestConstraints}, \
     {Mac, HmacSHA256, *, FullClassName:TestConstraints}, \
-    {AlgorithmParameters, PBES2, *, "sun.security.pkcs12.PKCS12KeyStore"}, \
-    {AlgorithmParameters, PBEWithHmacSHA256AndAES_256, *, "sun.security.pkcs12.PKCS12KeyStore"}, \
-    {SecretKeyFactory, PBEWithMD5AndDES, *, "sun.security.pkcs12.PKCS12KeyStore"}, \
-    {Cipher, PBEWithHmacSHA256AndAES_256, *, "sun.security.pkcs12.PKCS12KeyStore"}, \
-    {Mac, HmacPBESHA256, *, "sun.security.pkcs12.PKCS12KeyStore"}]
+    {AlgorithmParameters, PBES2, *, ModuleAndFullClassName:java.base/sun.security.pkcs12.PKCS12KeyStore}, \
+    {AlgorithmParameters, PBEWithHmacSHA256AndAES_256, *, ModuleAndFullClassName:java.base/sun.security.pkcs12.PKCS12KeyStore}, \
+    {SecretKeyFactory, PBEWithMD5AndDES, *, ModuleAndFullClassName:java.base/sun.security.pkcs12.PKCS12KeyStore}, \
+    {Cipher, PBEWithHmacSHA256AndAES_256, *, ModuleAndFullClassName:java.base/sun.security.pkcs12.PKCS12KeyStore}, \
+    {Mac, HmacPBESHA256, *, ModuleAndFullClassName:java.base/sun.security.pkcs12.PKCS12KeyStore}]
 RestrictedSecurity.TestConstraints.Version.jce.provider.4 = sun.security.ssl.SunJSSE [ \
     {KeyManagerFactory, SunX509, *, FullClassName:TestConstraints}, \
     {TrustManagerFactory, SunX509, *, FullClassName:TestConstraints}, \
     {SSLContext, TLSv1.3, *, FullClassName:TestConstraints}]
+
+RestrictedSecurity.TestConstraints.Version.securerandom.provider = SUN
+RestrictedSecurity.TestConstraints.Version.securerandom.algorithm = SHA512DRBG