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

8317374: Add Let's Encrypt ISRG Root X2 #2280

Closed
wants to merge 2 commits into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Nov 15, 2023

Unclean backport, but got resolved trivially. Pattern matching for switch isn't present in 11u. Test change in VerifyCACerts.java has slightly different context. Fixed those issues manually. Please review!

Testing:

  • GHA
  • test/jdk/sun/security/lib/cacerts and test/jdk/security/infra/java/security/cert/CertPathValidator tests. All pass (including the new one CAInterop.java#letsencryptisrgx2

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
  • JDK-8317374 needs maintainer approval

Issue

  • JDK-8317374: Add Let's Encrypt ISRG Root X2 (Enhancement - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2280

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 15, 2023

👋 Welcome back sgehwolf! 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 e6f46a43268808d0cbbb3bb93c73aa8e4cbfad83 8317374: Add Let's Encrypt ISRG Root X2 Nov 15, 2023
@openjdk
Copy link

openjdk bot commented Nov 15, 2023

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

@openjdk openjdk bot added the backport label Nov 15, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 15, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 15, 2023

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 20, 2023

Anyone willing to review this, please? Thanks!

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM

Hint: if you base this on the 17u commit, only the CAInterop change remains.
The other two changes, adapting the path and the hash, are identical.
You can use "Backport <17u hash>.
It's a bummer we always have to resolve the switch syntax.

@openjdk
Copy link

openjdk bot commented Nov 21, 2023

⚠️ @jerboaa This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Nov 21, 2023
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

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

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

8317374: Add Let's Encrypt ISRG Root X2

Reviewed-by: goetz

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 4 new commits pushed to the master branch:

  • 7814102: 8244508: JFR: FlightRecorderOptions reset date format
  • 10ddd51: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
  • 45e3cbf: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • 046b213: 8268916: Tests for AffirmTrust roots

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 ready Pull request is ready to be integrated and removed approval labels Nov 21, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 21, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 21, 2023

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

  • 7814102: 8244508: JFR: FlightRecorderOptions reset date format
  • 10ddd51: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
  • 45e3cbf: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • 046b213: 8268916: Tests for AffirmTrust roots

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 21, 2023
@openjdk openjdk bot closed this Nov 21, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 21, 2023
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

@jerboaa Pushed as commit f2488a3.

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

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 21, 2023

Hint: if you base this on the 17u commit, only the CAInterop change remains.
The other two changes, adapting the path and the hash, are identical.

I believe I did that. The context for 11u was still different enough for it to not apply cleanly.

You can use "Backport <17u hash>.

In the PR?

It's a bummer we always have to resolve the switch syntax.

Yeah.

@GoeLin
Copy link
Member

GoeLin commented Nov 21, 2023

In the PR?
As title of the PR, or as title of the change you push for your PR.
You can also use the /backport command in any commit, but this won't help here as it's not clean.

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
2 participants