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

8318759: Add four DigiCert root certificates #399

Closed

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Nov 28, 2023

Backport for adding 4 new digicert root certificates. Patch applies clean modulo path shuffeling.

Testing:

  • GHA
  • jdk/test/security/infra/java/security/cert/CertPathValidator and jdk/test/sun/security/lib/cacerts jtreg tests. Including new ones. All 43 tests pass.

Progress

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

Issue

  • JDK-8318759: Add four DigiCert root certificates (Enhancement - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 399

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

Using diff file

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

Webrev

Link to Webrev Comment

@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 28, 2023

Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#actalisauthenticationrootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#buypassclass2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#buypassclass3ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#certignarootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#comodoeccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#comodorsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlseccrootg5
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlsrsarootg5
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#entrustrootcaec1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#entrustrootcag4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsigneccrootcar4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsignrootcar6
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#godaddyrootg2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#letsencryptisrgx1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#letsencryptisrgx2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#microsoftecc2017
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#microsoftrsa2017
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca1g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca2g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca3g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrooteccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrootevrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrootrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#starfieldrootg2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliarootcav2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#twcaglobalrootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrusteccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrustrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/DigicertCSRootG5.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java
Passed: sun/security/lib/cacerts/VerifyCACerts.java
Test results: passed: 43

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/398 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 0ea58048f9b4cdaaa0470b2bcc03913fb3939453 8318759: Add four DigiCert root certificates Nov 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 28, 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 Nov 28, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 28, 2023

Webrevs

@phohensee
Copy link
Member

linux-x86 test failure appears unrelated.

@jerboaa jerboaa force-pushed the jdk-8318759-add-four-digicert-certs branch from dc542fe to a1b7364 Compare December 11, 2023 13:38
@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@jerboaa this pull request can not be integrated into pr/398 due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout jdk-8318759-add-four-digicert-certs
git fetch https://git.openjdk.org/jdk8u-dev.git pr/398
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/398"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 11, 2023
@openjdk
Copy link

openjdk bot commented Dec 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.

@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Dec 11, 2023
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/398 to master December 11, 2023 15:47
@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-8318759-add-four-digicert-certs
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 11, 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.

@jerboaa jerboaa force-pushed the jdk-8318759-add-four-digicert-certs branch from a1b7364 to 3b40fb6 Compare December 11, 2023 16:09
@openjdk
Copy link

openjdk bot commented Dec 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.

@openjdk openjdk bot added the approval label Dec 11, 2023
@openjdk openjdk bot mentioned this pull request Dec 11, 2023
4 tasks
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 (sans paths). New tests pass.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@gnu-andrew
8318759: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

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

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

8318759: Add four DigiCert root certificates

Reviewed-by: phh, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Dec 11, 2023
@openjdk openjdk bot removed the approval label Dec 11, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 11, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

Going to push as commit 7098ac7.

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

openjdk bot commented Dec 11, 2023

@jerboaa Pushed as commit 7098ac7.

💡 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