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

8288985: P11TlsKeyMaterialGenerator should work with ChaCha20-Poly1305 #650

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Aug 30, 2022

Hi all,

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

The commit being backported was authored by Zdenek Zambersky on 29 Jun 2022 and was reviewed by Valerie Peng.

The patch applies cleanly. The test fails on an unpatched install of 17.0.4 and passes on a patched build.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8288985: P11TlsKeyMaterialGenerator should work with ChaCha20-Poly1305

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 650

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2022

👋 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 openjdk bot changed the title Backport b6bd190d8d10fdb177f9fb100c9f44c9f57a3cb5 8288985: P11TlsKeyMaterialGenerator should work with ChaCha20-Poly1305 Aug 30, 2022
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

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

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@gnu-andrew 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:

8288985: P11TlsKeyMaterialGenerator should work with ChaCha20-Poly1305

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 30, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

I see jdk17u-fix-yes

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 31, 2022

Going to push as commit 00445e8.
Since your change was applied there has been 1 commit pushed to the master branch:

  • d3197e7: 8287463: JFR: Disable TestDevNull.java on Windows

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 31, 2022

@gnu-andrew Pushed as commit 00445e8.

💡 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 clean integrated Pull request has been integrated
1 participant