From a83af4505ecd1dde49a90ffbcb44a4ebb6c4631f Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Tue, 14 Aug 2018 14:46:13 -0700
Subject: [PATCH] 8209506: Add Google Trust Services GlobalSign root
 certificates

Reviewed-by: mullan
---
 src/java.base/share/lib/security/cacerts      | Bin 99953 -> 101493 bytes
 .../lib/security/cacerts/VerifyCACerts.java   |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/lib/security/cacerts b/src/java.base/share/lib/security/cacerts
index 522f979b35c3d8de6365c3aead11d61337e4e9ec..0981dbcd270a607855340cc3c727ab28000191f3 100644
GIT binary patch
delta 1111
zcmey^!}fIs8_&PD|K2h%Ffaje%=CvsjKUk`ZFK$8bMliCbBZ(5^NNg;6BVMfQnF(i
z7#LHn^qjdESR?dI4J;WLnD-epG4C>HVp_C-nTe5!iJJvz2m>R3o7yv8170>xtu~Lg
z@4SqRtdp<4R%JAr{QI@On3<uGp{ap|0T4uq^BNgKxRV{;Xn+-HPoDBdp?=wU6~29X
z`5H4_osO)wQw*8SeYw7+;Fr+m)BD@wkJYzb-eeGS?eE%;)pwr$NSMYsN#N^+;CsKT
z>xw(p1a(w<Ej#78EN;c}o+!aRRZXw=^}O7?W|}Jdbg!9O?D|{e%J+BiZ)K{Hp0?xY
zPAi=~*MxSyj;wujfvqh*&NFMPWn70z{hK`%JRCDxa#o!6-m;*Ur_%Ss4&Bp=r>^Ei
z*FIdJ*|PBG<td)0Rgxwu?77Q*_2!wMuhhA;izgnNE4}8#=@$<ce9@oK?fZL!ne;cw
zs@4a&pAv;TV&*@X%oRAjE9%_()mOi-;#`%m_s-4u`$a1ggyR?(PkQ~bU-F8bS&^x)
z=@j!J-r4<3%!~|-iyP+{G|rrSP*_J~_9OQ2bQ!q=S#0+rx6IPLe@C)SZ}OS7a@L55
z(#uON(J#u+FVQVB(n~JNF_33t4wY4AkuVTzz^>m>N2GpcV{p4n#`Ly{ZytE<aN%Cv
zxJKRo+QA(%&J~+^X8n1kW0RLC?dz@ibv~=C+QA(!n;DW^x2@!uymO_ox5TVNKiWI|
zZr?35kvbT1%gz45Wv$h@AxdAZlFlmR@6znNes|)#%Q1`W7DhXMz5g`DS@-2t%hi__
z-QV7Q;Xs3=jOzj2p86L*beEKbc^+lm>MwdP&!xh$eMQ~w&y^ArcYn#Bd+<Y#X-_QU
z@58w}-@D{ix*67S{ae{|@c;YOc?w4YPR7smoh{zO^OW)A0>`Z4;9pAvw&bbu|Mrpi
z@;B&aU*^Uag8cV7Zv2+@{J!em)bk1zhZ2Ntt2*>#{i$=Za7YpQKCkg1(`3EPp}K$g
zrW@olin^H~C3M{<m*EMW@u@)*<3k{Bha_}CEsG^G)3{jfIc?Hd%KgG*29p678wW7C
zpR;9QW}5ytpHZFB1eo0Qra#PQbOtlEqaqE2+1SBqm>8jonHkxcofuel9IL$CpQFk*
zU(ZrfhIz@lSx+t5ImJ#TZ`|4TqbvMi_&KLv#S6cuI{lYB$gnA|nD75_#itTWR^2SL
zUvXvUxgOccf|>?dAsedKy6$-7Q2(1N@Ap3AlQxT6t|GgN*@MBrl}VA|&ZLD4gqNLX
z-tg>*;`9l>M8b8M-@LQAoOfzPPT8JC_jWTWsIO>MH=P}JZ1E@eOWX6LnHa=Zr7shm
uc<<MgH`Uxf=C?Ha*lhQ)VHETddBOj1s)lBHEWhIm-I_&$UoOPR*#H3bs^EG6

delta 58
zcmex5gY9Dv8_&PD|K2h%Ffaje)J7hE-OX->-}stCowkQMG4gnc?5W;g^7+M<cUG1^
O5;hont#_E>#sL7pUl>0C

diff --git a/test/jdk/lib/security/cacerts/VerifyCACerts.java b/test/jdk/lib/security/cacerts/VerifyCACerts.java
index a2934bd0663..9ef35e35d8e 100644
--- a/test/jdk/lib/security/cacerts/VerifyCACerts.java
+++ b/test/jdk/lib/security/cacerts/VerifyCACerts.java
@@ -25,6 +25,7 @@
 /**
  * @test
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779 8209452
+ *      8209506
  * @summary Check root CA entries in cacerts file
  */
 import java.io.File;
@@ -41,7 +42,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 = 92;
 
     // map of cert alias to SHA-256 fingerprint
     private static final Map<String, String> FINGERPRINT_MAP
@@ -227,6 +228,10 @@ public class VerifyCACerts {
                     "CB:B5:22:D7:B7:F1:27:AD:6A:01:13:86:5B:DF:1C:D4:10:2E:7D:07:59:AF:63:5A:7C:F4:72:0D:C9:63:C5:3B");
             put("globalsigneccrootcar5 [jdk]",
                     "17:9F:BC:14:8A:3D:D0:0F:D2:4E:A1:34:58:CC:43:BF:A7:F5:9C:81:82:D7:83:A5:13:F6:EB:EC:10:0C:89:24");
+            put("globalsigneccrootcar4 [jdk]",
+                    "BE:C9:49:11:C2:95:56:76:DB:6C:0A:55:09:86:D7:6E:3B:A0:05:66:7C:44:2C:97:62:B4:FB:B7:73:DE:22:8C");
+            put("globalsignr2ca [jdk]",
+                    "CA:42:DD:41:74:5F:D0:B8:1E:B9:02:36:2C:F9:D8:BF:71:9D:A1:BD:1B:1E:FC:94:6F:5B:4C:99:F4:2C:1B:9E");
         }
     };