Skip to content

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 6, 2023

Backport of JDK-8314960 to add new certigna root 2 certificate to OpenJDK 8u392 as a critical fix during rampdown. Patch applies cleanly after path shuffling and backporting JDK-8295894. See #48

Testing:

  • GHA
  • jdk/test/security/infra/java/security/cert/CertPathValidator and jdk/test/sun/security/lib/cacerts jtreg tests. All pass except AmazonCA.java which is a different matter (it'll be OK again once JDK-8309088 is in as well).

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

  • JDK-8314960: Add Certigna Root CA - 2 (Enhancement - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u.git pull/49/head:pull/49
$ git checkout pull/49

Update a local copy of the PR:
$ git checkout pull/49
$ git pull https://git.openjdk.org/jdk8u.git pull/49/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 49

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u/pull/49.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/48 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 a44f8b059847135ecd0618cb04abbb0d2be1d2d0 8314960: Add Certigna Root CA - 2 Sep 6, 2023
@openjdk
Copy link

openjdk bot commented Sep 6, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 6, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2023

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/48 to master September 11, 2023 08:12
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8314960-certigna-root-ca-2
git fetch https://git.openjdk.org/jdk8u.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@jerboaa jerboaa force-pushed the JDK-8314960-certigna-root-ca-2 branch from c8e4d16 to 1d96183 Compare September 11, 2023 08:16
@openjdk
Copy link

openjdk bot commented Sep 11, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 12, 2023

@gnu-andrew Ready for you to review, please!

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.

Patch looks clean. Approved for 8u392.

@openjdk
Copy link

openjdk bot commented Sep 15, 2023

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

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

8314960: Add Certigna Root CA - 2

Reviewed-by: andrew

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:

  • 05254ef: Merge
  • 0ee1400: Merge
  • f929269: 8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
  • aa3e9dd: 8202952: C2: Unexpected dead nodes after matching

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 Sep 15, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 18, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 18, 2023

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

  • 05254ef: Merge
  • 0ee1400: Merge
  • f929269: 8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
  • aa3e9dd: 8202952: C2: Unexpected dead nodes after matching

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 18, 2023

@jerboaa Pushed as commit b24b03f.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants