From 47a39418faf1dd664db6c27e08d4a09d56b9861b Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 15 May 2019 13:22:29 -0700
Subject: [PATCH] 8222136: Remove two Comodo root CA certificates that are
 expiring

Reviewed-by: mullan
---
 src/java.base/share/lib/security/cacerts      | Bin 102705 -> 100258 bytes
 .../security/lib/cacerts/VerifyCACerts.java   |  12 ++----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/lib/security/cacerts b/src/java.base/share/lib/security/cacerts
index c27ffd1807871f6474c578c88dadf8a13602e1b4..a83bf49ee1b24fd79517c1e134c7d8c56e0ab0d1 100644
GIT binary patch
delta 59
zcmdnEh;30n8_&PD|K2h%Ffaje)JC4A+0By+wofi#+`zK^LnWiGxX9Q3$p$`agkCZi
PntXU$J=M=T^yYs6)`c05

delta 1840
zcmbW$do<I190%~-%q5dpTP_>vLR<9PTt~WNgsdpJ)iBIuYHcL6%yAioETLRxE%mrI
zJj$(;<dTRIPI@9mH}Qy)BA!u?>OAK>&pFQ@-*Z0SbAG?i`<(ClyoAYcu@EjlH##>8
z0)Zfs<CacQ1}lp-QUms{VY3+QV>G4@oq3Gq6-cKsSX4I4j}}Cw2YOL8UH!cS+(97l
z;pKfmG)T%>&k!JiK(Ks(3ljodXo3I=0Ye~)yKc%SI)K(ztmraYx6b!2k3SHM;crF<
zx)=claHtaus;ukeXs_$E&tk9TLXhsx#U#z`3sDRf-HXbi2QxIO3~x<~g=7GWMvzE=
zF+d_16HN>O7c_$K{i<(dXyO7ymGBAZP^161p1=CB7N?99BbtaT+-~M+X<X7?f0$iM
zqJ6eewGvjfk=y(;y6p^Aszf`6?^{1l*o2LENRV!}uZZ@}*4xl6^u7~Q7eg@&6WRNv
zgsYzrrCvo(WUQRvx7`&H(`w}R0CgFHWr@QKHKFB~<F&%z!h;@{H+8i31r=->DatGN
zFSxGf%P~w08^qG%pTD$h7hHaObJ_h6(-R68-_G`FyP6-<(0WOxHrY<n#aH#zDjyLv
zH`a0!l0*uZdwDx&Q7)yJqrEE*_EpCrO214F-X0e<`kwCTaWw6h6IDY)%V{lNv0W_B
zf>o`4d~9CK$&XgFd((CYbXX4!=7GwwDNg`-T6N<H1PTU$FGW=WQI)_lNlTdJFqovy
zCjJ9ub!{HkH}X#Q`Xiv-6%OQxe)AF-BNA|4_(}st0rmiPg53h^SS$Vx745Cx%KWuU
zNtKID>Ul8(0nEaG>tHAV375gc!BSGvP{`5*<45t49B~lUJztd*QD`#+%<c<bx3;Nu
z^f|!|uP`=7bqa=U=^*tts#%{K8qu_^c$wp%$9#O|W5K0zo4)<(htp5}!4($U)Ft5O
zm&sN%^=iT_hT2botE=&h`vtwJb3>&gAJ$_~I8GptX1qyXsfhEm`N4|Ql#H^@OJ_Ta
zr*d<mIeaW;#|_KU0H5)ToVPEakYNa=zM$JMo4F0jt0rI?75(<+3<zTy-DL8QzudP+
z{Q7zqGKZhv;QgZL<k9xp+&56QwwX6Yg!<Bml`KeRLzz|nZ6dX|IheebqMg?r=QI(X
zoMDd28Dm#YcP33tHkIhOUKyV>LeDlxb+tkvHjdFn0oRKHz`w(&>OY(GqcXiisZ83h
z7>$npz<6AOktM<C_D_tsIhx#800Ec9#gbz`A;6NS2LVy(3wCyDEY>2SiTaf$`Fr3`
z22BWn0r7`H69S1ylo(vxqxoNZ_-A*o=7>Kvm~5@M%IP3+DZZUSxew=^Ctu~_-ywL8
znN=p4s87#UhmmjBP+3anF`NCF-J2DCO-ZA8<#wNuG+BL7V7mBq)4O_hSeB*7nZi#0
zuT?lFw4!6V%J_w;_hR?TD?u~Qj-msE@iU--IaNZa`~~m{G4TZ+EN#MQxa_fpQ)_WC
z+@bz1ko;sAf1=BEMt>Vt(4B#<O^j>cb-4?Y$_fgmlIZd9#xK0plQP+KJz4#W8xWSu
zPq$ecT%%L!KEvDnihXQrw-iz9<l+@t2F%AIV7A$E9sy^2#+pZU&J^0k@s4#eM4ebv
zB62Wf7nI{wG}LaL)tLIBkeH`RcKugvdCWuW)pRm;rnyTScgLL1-u<w_0@(FUn>k<x
zkOam8!&v=AZGZQ(D2wn-77ox^@&sO*q?RW5(j>j8%}Ql?KdUJ-y>zx%$Ag_TqU$?m
zACB*ppP%Z#=OmOHv~{HM4+rEbWfglwZya$cxizHw0px|baVv15!@9<f9}Lfz(<-y}
zl(C<0X+f67qugJChm_KWEey&N>2)0yG0AL7PNb=cDUz(zG;_sF^$dc$P5L!VCMAz|
zPsM>V(5eou#lTd;6+_a^#!^yR?<i=X80<gwr@Mk(vFBerV}-K96NC)iry)HgfID88
zwRZy7Tx#ucve|E#8`a{k{aHI6*X`_(rZH}&exN22N%F*BxO*-YcS%crp0_^o&>Fl|
z?@G*X{y7u`j*=7g`H`8&5hacyF$-IhJq_`>dfn{^n21K=v8&!szcF_8zn1>wg5vBp
J*VZq@zW_(9?s@<K

diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index dd2d3d3377b..b373ae8a851 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -25,7 +25,7 @@
 /**
  * @test
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
- *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137
+ *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  * @summary Check root CA entries in cacerts file
  */
 import java.io.File;
@@ -49,7 +49,7 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 92;
+    private static final int COUNT = 90;
 
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
@@ -85,10 +85,6 @@ public class VerifyCACerts {
                     "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A");
             put("utnuserfirstobjectca [jdk]",
                     "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F");
-            put("utnuserfirstclientauthemailca [jdk]",
-                    "43:F2:57:41:2D:44:0D:62:74:76:97:4F:87:7D:A8:F1:FC:24:44:56:5A:36:7A:E6:0E:DD:C2:7A:41:25:31:AE");
-            put("utnuserfirsthardwareca [jdk]",
-                    "6E:A5:47:41:D0:04:66:7E:ED:1B:48:16:63:4A:A3:A7:9E:6E:4B:96:95:0F:82:79:DA:FC:8D:9B:D8:81:21:37");
             put("addtrustclass1ca [jdk]",
                     "8C:72:09:27:9A:C0:4E:27:5E:16:D0:7F:D3:B7:75:E8:01:54:B5:96:80:46:E3:1F:52:DD:25:76:63:24:E9:A7");
             put("addtrustexternalca [jdk]",
@@ -253,10 +249,6 @@ public class VerifyCACerts {
             add("certplusclass3pprimaryca [jdk]");
             // Valid until: Tue Jul 09 14:40:36 EDT 2019
             add("utnuserfirstobjectca [jdk]");
-            // Valid until: Tue Jul 09 13:36:58 EDT 2019
-            add("utnuserfirstclientauthemailca [jdk]");
-            // Valid until: Tue Jul 09 14:19:22 EDT 2019
-            add("utnuserfirsthardwareca [jdk]");
         }
     };