ALPN

JinhangZhang · May 14, 2024 · 4180d32 · 4180d32
1 parent 5b9b605
commit 4180d32
Show file tree

Hide file tree

Showing 2 changed files with 6 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
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) {