ALPN

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

Hide file tree

Showing 2 changed files with 10 additions and 2 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
@@ -23,6 +23,8 @@
  * questions.
  */
 
+package javax.net.ssl;
+
 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
@@ -36,6 +36,8 @@
 import java.util.Base64;
 import javax.net.ssl.*;
 
+import javax.net.ssl.BaseUtils;
+
 /**
  * SSLContext template to speed up JSSE tests.
  */
@@ -111,8 +113,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) {