From 5712e9e18bdf59fad111cf37e5be29ce50bd3243 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 30 May 2018 07:42:48 -0700
Subject: [PATCH] 8189949: Remove Baltimore Cybertrust Code Signing CA

Reviewed-by: mullan
---
 src/java.base/share/lib/security/cacerts      | Bin 88056 -> 87065 bytes
 .../lib/security/cacerts/VerifyCACerts.java   |   7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/lib/security/cacerts b/src/java.base/share/lib/security/cacerts
index 19d17423a17e38930302d8887db88f5d831be2f3..4c6ecd731f86483d5a261d0378c237911917bc69 100644
GIT binary patch
delta 109
zcmV-z0FwXsuLYT?1q}Y}{_Ow&00IC208W!nu@$i)wlK4{G(z^b4=(`+2DkYt0Tu+e
z6*U1f36mv|5VuT10YC(|Nj?Gd1GkGt0VD~Nq$Cr!7E}Sw1GlPA0aOGOeN5e@LJ77H
PFuSPuw)2}+MpEscYg#CN

delta 916
zcmbQag7wFGR-S)v|Gi~kU|<4b|H+O$!W-px7=*|qCFYc5=H?frCg-Q57H6jCW#*+P
zCn`i|rDVr4Ffb<Y-wJ%kz#5@vYGBF0z`V+!iFuhp6I0&;W+p}^CKjM!`we*6IJMe5
z+P?ELGP1HV7^F|$+hiW3Z=lP@9LmBhtmXu>LBY8)DYYo1sI<65!5L_qLNLTSg`oWW
z5(7DLUIPOIQ$uq@69Yp7gD7!cBU2F9$k@~p$b}fIO@gtL7j&xCpD3IqA=FoO`{%4b
zj_YrH`oh__*8X3*xy`MUY5^NJ+MRykSIqEf)1A*p-F|bvmzZ{L`GYwvu?l=u3s#wR
z|I*l2p||<X3-`|~A0{YodA0s&@DA4R?y=f!AD1sVW^KCd5^s>>^)Hi3A1>kw2y5Rr
zox9q&RbZ!v#5?0x9)j1SC%Tu_D_wbaKKA(vKbg7HCf=R1w}f*=QR1o%idG+Ob(q6A
zFCDydc<b>H^VQGP7Hx7XEIuXJ@ovxal<yY=rHUP*PI&6@Z+}0bKBIxff?Jy3`pVY@
zn-BFpG}+QHGk0Ful}VZo8>e0}Uy?3V{~&4iI@6;w&6-?xJgbl}PAr@pt=l`lVrrB9
z>s%&gMh3>kQ3eqP!oUcTRb}BZ;9}#@W&_3*J2SI^EJ%=#MT|w{griA}s3^-*hffz*
z&&pSsRMqYjHTh19MSW1os;S;eJ;!aQE%_JwOMmO0*B`iFhFQp7%;jCUC!_nr(T1fe
zCVxLolMrlMX!h0od5FW+6#2vP1y0$zmdED>v7URLRdlJh$lg7mdG+yL)sq_@FAo-*
zx-2XBmBifsik0Q%Qa`s$caQ8)*VuaMq26^nzD2w{lw6n}UrgTMXtnTb{Sw{pWpXSb
zGb@Z7u4~u$?piiyLuDTOzMePlu3KbAALI$knE&tf#fK+4ettSzzpr(ROFBb<-4`|H
zlvm}oFXHTE%-v61d$r`Vna%V=mPM>nBvlVzH+SSeDBs@och$a^8&krc+@7@X{6o(d
z*76gDqYn4qRE_X#aOXe9yl&0o{o4;Pt<u_j$-w>Fc6nV!ahC0p>Wu7c+szFbjX1aO
zuw(qfJlU;BV0)z%qXWzKwN8x6oZGkgGy1bkp06UY{joRWIcAak-|zERbE+qvUUH}@
Mv{A)p-k(hZ0IdvyHvj+t

diff --git a/test/jdk/lib/security/cacerts/VerifyCACerts.java b/test/jdk/lib/security/cacerts/VerifyCACerts.java
index c5b1512396d..1eb2eb44d96 100644
--- a/test/jdk/lib/security/cacerts/VerifyCACerts.java
+++ b/test/jdk/lib/security/cacerts/VerifyCACerts.java
@@ -19,11 +19,12 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
+ *
  */
 
 /**
  * @test
- * @bug 8189131 8198240 8191844
+ * @bug 8189131 8198240 8191844 8189949
  * @requires java.runtime.name ~= "OpenJDK.*"
  * @summary Check root CA entries in cacerts file
  */
@@ -41,7 +42,7 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 79;
+    private static final int COUNT = 78;
 
     // map of cert alias to SHA-256 fingerprint
     private static final Map<String, String> FINGERPRINT_MAP
@@ -89,8 +90,6 @@ public class VerifyCACerts {
                     "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
             put("baltimorecybertrustca [jdk]",
                     "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
-            put("baltimorecodesigningca [jdk]",
-                    "A9:15:45:DB:D2:E1:9C:4C:CD:F9:09:AA:71:90:0D:18:C7:35:1C:89:B3:15:F0:F1:3D:05:C1:3A:8F:FB:46:87");
             put("digicertglobalrootca [jdk]",
                     "43:48:A0:E9:44:4C:78:CB:26:5E:05:8D:5E:89:44:B4:D8:4F:96:62:BD:26:DB:25:7F:89:34:A4:43:C7:01:61");
             put("digicertglobalrootg2 [jdk]",