Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8307134: Add GTS root CAs #1335

Closed
wants to merge 2 commits into from

Conversation

jianglizhou
Copy link
Contributor

@jianglizhou jianglizhou commented May 8, 2023

Backport to JDK 17u for parity with 17.0.9-oracle.

Merged conflicts and regenerated 'CHECKSUM' in test/jdk/sun/security/lib/cacerts/VerifyCACerts.java.
Verified both test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java and test/jdk/sun/security/lib/cacerts/VerifyCACerts.java pass with a testing JDK 17u binary.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1335/head:pull/1335
$ git checkout pull/1335

Update a local copy of the PR:
$ git checkout pull/1335
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1335/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1335

View PR using the GUI difftool:
$ git pr show -t 1335

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1335.diff

Webrev

Link to Webrev Comment

Co-authored-by: Andy Warner <awarner@google.com>
Co-authored-by: Rajan Halade <rhalade@openjdk.org>
Reviewed-by: mullan, rhalade
@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2023

👋 Welcome back jiangli! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 03030d47ebee5c20919fe0162ec86d3d400cd955 8307134: Add GTS root CAs May 8, 2023
@openjdk
Copy link

openjdk bot commented May 8, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 8, 2023
@mlbridge
Copy link

mlbridge bot commented May 8, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

@openjdk
Copy link

openjdk bot commented May 10, 2023

@jianglizhou This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8307134: Add GTS root CAs

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 406d6ba: 8307378: Allow collectors to provide specific values for GC notifications' actions

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 10, 2023
@jianglizhou
Copy link
Contributor Author

Thanks for the review.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should only need to update the checksum if JDK-8305975 & JDK-8304760 are applied first. It seems this change was instead altered to work around their absence, but the former is now in both 11u & 17u, and the latter is in 17u too.

@jianglizhou
Copy link
Contributor Author

You should only need to update the checksum if JDK-8305975 & JDK-8304760 are applied first. It seems this change was instead altered to work around their absence, but the former is now in both 11u & 17u, and the latter is in 17u too.

Yeah, thanks. Merged the PR and refreshed the CHECKSUM in VerifyCACerts.java.

@jianglizhou
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 23, 2023

Going to push as commit 2dc22d6.
Since your change was applied there have been 8 commits pushed to the master branch:

  • 17b3640: 8268582: javadoc throws NPE with --ignore-source-errors option
  • 39a6b55: 8287854: Dangling reference in ClassVerifier::verify_class
  • 9cb0120: 8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression
  • 32fda32: 8296343: CPVE thrown on missing content-length in OCSP response
  • 6b362e4: 8261495: Shenandoah: reconsider update references memory ordering
  • 879f4c5: 8297154: Improve safepoint cleanup logging
  • 2913a8d: 8306753: Open source several container AWT tests
  • 406d6ba: 8307378: Allow collectors to provide specific values for GC notifications' actions

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 23, 2023
@openjdk openjdk bot closed this May 23, 2023
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this looks correct now.

@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 23, 2023
@openjdk
Copy link

openjdk bot commented May 23, 2023

@jianglizhou Pushed as commit 2dc22d6.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants