From 3bbef61dbf925a2da049c74b645f161cd81482c5 Mon Sep 17 00:00:00 2001
From: rhalade <unknown>
Date: Thu, 16 May 2019 12:36:08 -0700
Subject: [PATCH] 8223499: Remove two DocuSign root certificates that are
 expiring Reviewed-by: mullan

---
 src/share/lib/security/cacerts                | Bin 100258 -> 98310 bytes
 .../security/lib/cacerts/VerifyCACerts.java   |  11 ++---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/share/lib/security/cacerts b/src/share/lib/security/cacerts
index a83bf49ee1b24fd79517c1e134c7d8c56e0ab0d1..1db6c41b89d4d6186ac8ecde19b25f9465f17b36 100644
GIT binary patch
delta 60
zcmZ3~&(_w!#`Ev(zqbqw3`{^AF+EV2QFx>L_5+)j9no*vzR-*Dt&K?Xya^9AH^%>e
Q+LpoDB;L|=KKb$t0O0}}MgRZ+

delta 1884
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

diff --git a/test/sun/security/lib/cacerts/VerifyCACerts.java b/test/sun/security/lib/cacerts/VerifyCACerts.java
index cb164e8b8..585f1e9cc 100644
--- a/test/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/sun/security/lib/cacerts/VerifyCACerts.java
@@ -26,6 +26,7 @@
  * @test
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
  *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
+ *      8223499
  * @summary Check root CA entries in cacerts file
  */
 import java.io.File;
@@ -49,7 +50,7 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 90;
+    private static final int COUNT = 88;
 
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
@@ -144,10 +145,6 @@ public class VerifyCACerts {
                     "69:DD:D7:EA:90:BB:57:C9:3E:13:5D:C8:5E:A6:FC:D5:48:0B:60:32:39:BD:C4:54:FC:75:8B:2A:26:CF:7F:79");
             put("verisignclass3g5ca [jdk]",
                     "9A:CF:AB:7E:43:C8:D8:80:D0:6B:26:2A:94:DE:EE:E4:B4:65:99:89:C3:D0:CA:F1:9B:AF:64:05:E4:1A:B7:DF");
-            put("certplusclass2primaryca [jdk]",
-                    "0F:99:3C:8A:EF:97:BA:AF:56:87:14:0E:D5:9A:D1:82:1B:B4:AF:AC:F0:AA:9A:58:B5:D5:7A:33:8A:3A:FB:CB");
-            put("certplusclass3pprimaryca [jdk]",
-                    "CC:C8:94:89:37:1B:AD:11:1C:90:61:9B:EA:24:0A:2E:6D:AD:D9:9F:9F:6E:1D:4D:41:E5:8E:D6:DE:3D:02:85");
             put("keynectisrootca [jdk]",
                     "42:10:F1:99:49:9A:9A:C3:3C:8D:E0:2B:A6:DB:AA:14:40:8B:DD:8A:6E:32:46:89:C1:92:2D:06:97:15:A3:32");
             put("dtrustclass3ca2 [jdk]",
@@ -244,10 +241,6 @@ public class VerifyCACerts {
     @SuppressWarnings("serial")
     private static final HashSet<String> EXPIRY_EXC_ENTRIES = new HashSet<String>() {
         {
-            // Valid until: Sat Jul 06 19:59:59 EDT 2019
-            add("certplusclass2primaryca [jdk]");
-            // Valid until: Sat Jul 06 19:59:59 EDT 2019
-            add("certplusclass3pprimaryca [jdk]");
             // Valid until: Tue Jul 09 14:40:36 EDT 2019
             add("utnuserfirstobjectca [jdk]");
         }
-- 
GitLab