ALPN

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

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
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 utils.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) {

diff --git a/...dk/javax/net/ssl/TLSCommon/BaseUtils.java → test/jdk/javax/net/ssl/utils/BaseUtils.java b/...dk/javax/net/ssl/TLSCommon/BaseUtils.java → test/jdk/javax/net/ssl/utils/BaseUtils.java
@@ -23,6 +23,8 @@
  * questions.
  */
 
+package utils;
+
 import java.security.Security;
 import java.security.Provider;