ALPN

JinhangZhang · May 15, 2024 · 79e404d · 79e404d
1 parent 5b9b605
commit 79e404d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...dk/javax/net/ssl/TLSCommon/BaseUtils.java → test/jdk/javax/net/ssl/BaseUtils.java b/...dk/javax/net/ssl/TLSCommon/BaseUtils.java → test/jdk/javax/net/ssl/BaseUtils.java
@@ -22,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 import java.security.Security;
 import java.security.Provider;
 

diff --git a/test/jdk/javax/net/ssl/templates/SSLContextTemplate.java b/test/jdk/javax/net/ssl/templates/SSLContextTemplate.java
@@ -111,8 +111,12 @@ protected TrustManager createTrustManager(Cert[] trustedCerts,
                                               ContextParameters params) throws Exception {
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         ByteArrayInputStream is;
-
-        KeyStore ts = KeyStore.getInstance("JKS");
+		KeyStore ts;
+        if (!BaseUtils.isFIPS()) {
+            ts = KeyStore.getInstance("JKS");
+        } else {
+            ts = KeyStore.getInstance("PKCS12");
+        }
         ts.load(null, null);
 
         if (trustedCerts != null && trustedCerts.length != 0) {