From b8e5b097b1426529c41e425bc888bf2d7c2d6dee Mon Sep 17 00:00:00 2001
From: Rui Li <ruiamzn@amazon.com>
Date: Wed, 12 Jul 2023 17:35:47 +0000
Subject: [PATCH] Remove expired certs

Merge 2baaf3d2bab64aa8ae93c7fad94873924fd94bb8 and bde467f01d76631e705307bb020ec474a0490f72
---
 .../security/lib/cacerts/AmazonCACertConstants.java  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/test/jdk/sun/security/lib/cacerts/AmazonCACertConstants.java b/test/jdk/sun/security/lib/cacerts/AmazonCACertConstants.java
index c0cf21a84c4..cb4cb1d53ef 100644
--- a/test/jdk/sun/security/lib/cacerts/AmazonCACertConstants.java
+++ b/test/jdk/sun/security/lib/cacerts/AmazonCACertConstants.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 public class AmazonCACertConstants {
-    public static final int AMAZON_CA_CERT_COUNT = 54;
+    public static final int AMAZON_CA_CERT_COUNT = 49;
     public static final Map<String, String> AMAZON_CA_FINGERPRINT_MAP = new HashMap<>() {
         {
             put("accvraiz1",
@@ -59,8 +59,6 @@ public class AmazonCACertConstants {
                     "0C:2C:D6:3D:F7:80:6F:A3:99:ED:E8:09:11:6B:57:5B:F8:79:89:F0:65:18:F9:80:8C:86:05:03:17:8B:AF:66");
             put("e-szignorootca2017",
                     "BE:B0:0B:30:83:9B:9B:C3:2C:32:E4:44:79:05:95:06:41:F2:64:21:B1:5E:D0:89:19:8B:51:8A:E2:EA:1B:99");
-            put("e-tugracertificationauthority",
-                    "B0:BF:D5:2B:B0:D7:D9:BD:92:BF:5D:4D:C1:3D:A2:55:C0:2C:54:2F:37:83:65:EA:89:39:11:F5:5E:55:F2:3C");
             put("emsigneccrootca-c3",
                     "BC:4D:80:9B:15:18:9D:78:DB:3E:1D:8C:F4:F9:72:6A:79:5D:A1:64:3C:A5:F1:35:8E:1D:DB:0E:DC:0D:7E:B3");
             put("emsigneccrootca-g3",
@@ -85,8 +83,6 @@ public class AmazonCACertConstants {
                     "34:D8:A7:3E:E2:08:D9:BC:DB:0D:95:65:20:93:4B:4E:40:E6:94:82:59:6E:8B:6F:73:C8:42:6B:01:0A:6F:48");
             put("gtsrootr4",
                     "34:9D:FA:40:58:C5:E2:63:12:3B:39:8A:E7:95:57:3C:4E:13:13:C8:3F:E6:8F:93:55:6C:D5:E8:03:1B:3C:7D");
-            put("hongkongpostrootca1",
-                    "F9:E6:7D:33:6C:51:00:2A:C0:54:C6:32:02:2D:66:DD:A2:E7:E3:FF:F1:0A:D0:61:ED:31:D8:BB:B4:10:CF:B2");
             put("hongkongpostrootca3",
                     "5A:2F:C0:3F:0C:83:B0:90:BB:FA:40:60:4B:09:88:44:6C:76:36:18:3D:F9:84:6E:17:10:1A:44:7F:B8:EF:D6");
             put("izenpe.com",
@@ -113,12 +109,6 @@ public class AmazonCACertConstants {
                     "22:A2:C1:F7:BD:ED:70:4C:C1:E7:01:B5:F4:08:C3:10:88:0F:E9:56:B5:DE:2A:4A:44:F9:9C:87:3A:25:A7:C8");
             put("szafirrootca2",
                     "A1:33:9D:33:28:1A:0B:56:E5:57:D3:D3:2B:1C:E7:F9:36:7E:B0:94:BD:5F:A7:2A:7E:50:04:C8:DE:D7:CA:FE");
-            put("trustcoreca-1",
-                    "5A:88:5D:B1:9C:01:D9:12:C5:75:93:88:93:8C:AF:BB:DF:03:1A:B2:D4:8E:91:EE:15:58:9B:42:97:1D:03:9C");
-            put("trustcorrootcertca-1",
-                    "D4:0E:9C:86:CD:8F:E4:68:C1:77:69:59:F4:9E:A7:74:FA:54:86:84:B6:C4:06:F3:90:92:61:F4:DC:E2:57:5C");
-            put("trustcorrootcertca-2",
-                    "07:53:E9:40:37:8C:1B:D5:E3:83:6E:39:5D:AE:A5:CB:83:9E:50:46:F1:BD:0E:AE:19:51:CF:10:FE:C7:C9:65");
             put("trustwaveglobalcertificationauthority",
                     "97:55:20:15:F5:DD:FC:3C:87:88:C0:06:94:45:55:40:88:94:45:00:84:F1:00:86:70:86:BC:1A:2B:B5:8D:C8");
             put("trustwaveglobaleccp256certificationauthority",