Skip to content

Conversation

@gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Oct 2, 2024

Hi all,

This pull request contains a backport of commit f554c3ff from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 27 Sep 2024 and was reviewed by Sean Mullan.

The commit does not apply cleanly to 8u-dev due to the absence of JDK-8339560. Equivalent changes to those in distrust/Entrust.java are applied to Entrust/Distrust.java instead. Also, a hunk in EntrustTLSPolicy.java had to be applied manually due to the different context caused by the replacement of LocalDate.ofInstant for 8u and the java.security changes had to be replicated across all five variants in 8u (linux,macosx, solaris, aix, windows)

The tests in test/jdk/sun/security/ssl/X509TrustManagerImpl/Entrust passed with the updated build and failed against the upcoming 8u432 release in the 8u repository.

Thanks!


Progress

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

Issues

  • JDK-8341059: Change Entrust TLS distrust date to November 12, 2024 (Enhancement - P2 - Approved)
  • JDK-8341087: Change Entrust TLS distrust date to November 12, 2024 (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 588

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2024

👋 Welcome back andrew! 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
Copy link

openjdk bot commented Oct 2, 2024

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

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

8341059: Change Entrust TLS distrust date to November 12, 2024

Reviewed-by: sgehwolf

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 changed the title Backport f554c3ffce7599fdb535b03db4a6ea96870b3c2d 8341059: Change Entrust TLS distrust date to November 12, 2024 Oct 2, 2024
@openjdk
Copy link

openjdk bot commented Oct 2, 2024

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 Oct 2, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2024

Webrevs

Copy link
Contributor

@jerboaa jerboaa 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 Oct 2, 2024

⚠️ @gnu-andrew 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.

@gnu-andrew
Copy link
Member Author

/approval request Distrust date needs to be moved later across all updates that picked up [JDK-8337664](https://bugs.openjdk.org/browse/JDK-8337664). Patch did not backport cleanly but has been reviewed by Severin Gehwolf.

@gnu-andrew
Copy link
Member Author

LGTM.

Thanks for the quick review.

@openjdk
Copy link

openjdk bot commented Oct 2, 2024

@gnu-andrew
8341059: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Oct 2, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Oct 2, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 2, 2024

@jerboaa
8341059: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Oct 2, 2024
@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 3, 2024

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

  • 6acc668: 8209023: fix 2 compiler tests to avoid JDK-8208690
  • 61a4127: 8251188: Update LDAP tests not to use wildcard addresses
  • b4264bc: 8340815: Add SECURITY.md file

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 3, 2024

@gnu-andrew Pushed as commit 02b8101.

💡 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