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 #1369

Closed
wants to merge 1 commit into from

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Sep 22, 2022

Backport making P11TlsKeyMaterialGenerator work with ChaCha20-Poly1305

Clean backport, passed jdk_security.


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/jdk11u-dev pull/1369/head:pull/1369
$ git checkout pull/1369

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1369

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 22, 2022

👋 Welcome back zzambers! 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 Sep 22, 2022
@openjdk
Copy link

openjdk bot commented Sep 22, 2022

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

@openjdk
Copy link

openjdk bot commented Sep 22, 2022

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

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

  • 6e53ef2: 8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
  • b5dbfef: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
  • dab4c44: 8285698: Create a test to check the focus stealing of JPopupMenu from JComboBox
  • 7957658: 8210047: some pages contain content outside of landmark region
  • bcdcc9f: 8240281: Remove failing assertion code when selecting first memory state in SuperWord::co_locate_pack
  • 32d4246: 8193942: Regression automated test '/open/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java' fails

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 22, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 22, 2022

Webrevs

@zzambers
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 27, 2022
@openjdk
Copy link

openjdk bot commented Sep 27, 2022

@zzambers
Your change (at version 67bfbef) is now ready to be sponsored by a Committer.

@gnu-andrew
Copy link
Member

I'd forgotten 11u had ChaCha20-Poly1305 now (only added in 11.0.15 with JDK-8255410). I'll sponsor this to go in.

@gnu-andrew
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

  • ca33f6c: 8293578: Duplicate ldc generated by javac
  • 2ebb899: 8287076: Document.normalizeDocument() produces different results
  • 378b516: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • 5944581: 8285836: sun/net/www/http/KeepAliveCache/KeepAliveProperty.java failed with "RuntimeException: Failed in server"
  • 367a734: 8275170: Some jtreg sound tests should be marked with sound keyword
  • dbf95d4: Merge
  • 2f695bb: 8292579: (tz) Update Timezone Data to 2022c
  • cd29d6e: 8028265: Add legacy tz tests to OpenJDK
  • 1215ef1: 8294138: [11u] Revert change from JDK-8210962 in basic.m4
  • 6e53ef2: 8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/9ae65e8dcfac44105572706c9f7537976cfbef82...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 4, 2022

@gnu-andrew @zzambers Pushed as commit 66d4be3.

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