From 7ca7d8e7c5ee2e360049fada4a970be0c9ac776a Mon Sep 17 00:00:00 2001
From: JinhangZhang <Jinhang.Zhang@ibm.com>
Date: Thu, 3 Oct 2024 00:47:50 -0400
Subject: [PATCH] update

---
 .../net/ssl/SSLSocket/ClientExcOnAlert.java   |  93 +++++++++++++-----
 test/jdk/javax/net/ssl/SSLSocket/keystore.p12 | Bin 0 -> 2636 bytes
 2 files changed, 69 insertions(+), 24 deletions(-)
 create mode 100644 test/jdk/javax/net/ssl/SSLSocket/keystore.p12

diff --git a/test/jdk/javax/net/ssl/SSLSocket/ClientExcOnAlert.java b/test/jdk/javax/net/ssl/SSLSocket/ClientExcOnAlert.java
index 88e9f08edae..7e3647f4d73 100644
--- a/test/jdk/javax/net/ssl/SSLSocket/ClientExcOnAlert.java
+++ b/test/jdk/javax/net/ssl/SSLSocket/ClientExcOnAlert.java
@@ -31,6 +31,7 @@
  * @bug 8242294
  * @summary JSSE Client does not throw SSLException when an alert occurs during
  *          handshaking.
+ * @library /test/lib
  * @run main/othervm ClientExcOnAlert TLSv1.2
  * @run main/othervm ClientExcOnAlert TLSv1.3
  */
@@ -58,6 +59,8 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
+import jdk.test.lib.Utils;
+
 public class ClientExcOnAlert {
     // This is a PKCS#12 keystore created with the following command:
     // keytool -genkeypair -alias testcert -keyalg rsa -keysize 2048
@@ -69,7 +72,62 @@ public class ClientExcOnAlert {
     // file.
     private static int serverPort = -1;
     private static final String KEYSTORE_PASS = "password";
-    // private static final String KEYSTORE_PEM_FIPS = ;
+    private static final String KEYSTORE_PEM_FIPS =
+        "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";
     private static final String KEYSTORE_PEM =
         "MIIJrwIBAzCCCWgGCSqGSIb3DQEHAaCCCVkEgglVMIIJUTCCBW0GCSqGSIb3DQEH\n" +
         "AaCCBV4EggVaMIIFVjCCBVIGCyqGSIb3DQEMCgECoIIE+zCCBPcwKQYKKoZIhvcN\n" +
@@ -128,7 +186,8 @@ public class ClientExcOnAlert {
     static final Condition serverReady = lock.newCondition();
 
     public static void main(String[] args) throws Exception {
-        printPEM(KEYSTORE_PEM);
+        System.setProperty("javax.net.ssl.trustStore", "keystore.p12");
+        System.setProperty("javax.net.ssl.trustStorePassword", KEYSTORE_PASS);
         Thread serverThread = new Thread(() -> {
                     try {
                         doServerSide();
@@ -153,8 +212,14 @@ static void doServerSide() throws Exception {
         Thread.currentThread().setName("ServerThread");
         SSLContext sslc = SSLContext.getInstance("TLS");
         log("doServerSide start");
-        KeyManagerFactory kmf = createKeyManagerFactory(KEYSTORE_PEM,
-                KEYSTORE_PASS);      
+        KeyManagerFactory kmf;
+        if (!(Utils.isFIPS())) {
+            kmf = createKeyManagerFactory(KEYSTORE_PEM,
+                KEYSTORE_PASS);
+        } else {
+            kmf = createKeyManagerFactory(KEYSTORE_PEM_FIPS,
+                KEYSTORE_PASS);
+        }    
         sslc.init(kmf.getKeyManagers(), null, null);
         SSLServerSocketFactory ssf =
                 (SSLServerSocketFactory)sslc.getServerSocketFactory();
@@ -249,24 +314,4 @@ private static void log(String msgFmt, Object ... args) {
         sb.append(String.format(msgFmt, args));
         System.out.println(sb.toString());
     }
-
-    private static void printPEM(String KEYSTORE_PEM) {
-        Base64.Decoder b64dec = Base64.getMimeDecoder();
-        byte[] pemBytes = b64dec.decode(KEYSTORE_PEM);
-
-        try {
-            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
-            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(pemBytes));
-
-            System.out.println("Certificate:");
-            System.out.println("  Subject: " + cert.getSubjectX500Principal().getName());
-            System.out.println("  Issuer: " + cert.getIssuerX500Principal().getName());
-            System.out.println("  Serial Number: " + cert.getSerialNumber());
-            System.out.println("  Valid from: " + cert.getNotBefore());
-            System.out.println("  Valid until: " + cert.getNotAfter());
-            System.out.println("  Public Key Algorithm: " + cert.getPublicKey().getAlgorithm());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }
\ No newline at end of file
diff --git a/test/jdk/javax/net/ssl/SSLSocket/keystore.p12 b/test/jdk/javax/net/ssl/SSLSocket/keystore.p12
new file mode 100644
index 0000000000000000000000000000000000000000..1ef00155d70239555531107b6e4c93fea3ff3c48
GIT binary patch
literal 2636
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
O?Zano_@nDzk?=RP1;9xF

literal 0
HcmV?d00001