Skip to content
Permalink
Browse files
8225083: Remove Google certificate that is expiring in December 2021
Reviewed-by: xuelei, mullan
  • Loading branch information
rhalade committed Aug 17, 2021
1 parent cf64c3e commit 1cbf41a87b153c010c51fdbae832e00314422193
Showing with 3 additions and 34 deletions.
  1. +0 −29 make/data/cacerts/globalsignr2ca
  2. +3 −5 test/jdk/sun/security/lib/cacerts/VerifyCACerts.java

This file was deleted.

@@ -27,7 +27,7 @@
* @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
* 8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
* 8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
* 8243559 8225072 8258630 8259312 8256421 8225081 8225082
* 8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083
* @summary Check root CA entries in cacerts file
*/
import java.io.ByteArrayInputStream;
@@ -54,12 +54,12 @@
+ File.separator + "security" + File.separator + "cacerts";

// The numbers of certs now.
private static final int COUNT = 90;
private static final int COUNT = 89;

// SHA-256 of cacerts, can be generated with
// shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
private static final String CHECKSUM
= "A2:36:27:B7:F6:99:7A:C7:7E:2D:55:47:66:57:08:3F:F8:8C:F2:28:77:29:30:40:A2:D3:6D:1A:B6:C7:32:6F";
= "CC:AD:BB:49:70:97:3F:42:AD:73:91:A0:A2:C4:B8:AA:D1:95:59:F3:B3:22:09:2A:1F:2C:AB:04:47:08:EF:AA";

// Hex formatter to upper case with ":" delimiter
private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -220,8 +220,6 @@
"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");
put("teliasonerarootcav1 [jdk]",
"DD:69:36:FE:21:F8:F0:77:C1:23:A1:A5:21:C1:22:24:F7:22:55:B7:3E:03:A7:26:06:93:E8:A2:4B:0F:A3:89");
put("globalsignrootcar6 [jdk]",

5 comments on commit 1cbf41a

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot replied Aug 17, 2021

@rhalade

This comment has been minimized.

Copy link
Member Author

@rhalade rhalade replied Aug 17, 2021

/backport jdk17u

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Aug 17, 2021

@rhalade the backport was successfully created on the branch rhalade-backport-1cbf41a8 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 1cbf41a8 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 17 Aug 2021 and was reviewed by Xue-Lei Andrew Fan and Sean Mullan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u rhalade-backport-1cbf41a8:rhalade-backport-1cbf41a8
$ git checkout rhalade-backport-1cbf41a8
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u rhalade-backport-1cbf41a8
@RealCLanger

This comment has been minimized.

Copy link
Contributor

@RealCLanger RealCLanger replied Sep 9, 2021

/backport jdk11u-dev

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Sep 9, 2021

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-1cbf41a8 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 1cbf41a8 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 17 Aug 2021 and was reviewed by Xue-Lei Andrew Fan and Sean Mullan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev RealCLanger-backport-1cbf41a8:RealCLanger-backport-1cbf41a8
$ git checkout RealCLanger-backport-1cbf41a8
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev RealCLanger-backport-1cbf41a8
Please sign in to comment.