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

8281628: KeyAgreement : generateSecret intermittently not resetting #1145

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 13, 2022

I backport this for parity with 11.0.17-oracle.

I had to adapt the copyright in DHKeyAgreement.java
and change hex printing in the test.
Test fails without the fix and passes with the fix.


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-8281628: KeyAgreement : generateSecret intermittently not resetting

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1145

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2022

👋 Welcome back goetz! 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 1485883c9e6e24315bb21f20604b1c326e862a5b 8281628: KeyAgreement : generateSecret intermittently not resetting Jun 13, 2022
@openjdk
Copy link

openjdk bot commented Jun 13, 2022

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 Jun 13, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have used buf.append(String.format("%02x", block[i]));, but ok. It's just a test.

@openjdk
Copy link

openjdk bot commented Jun 13, 2022

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

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

8281628: KeyAgreement : generateSecret intermittently not resetting

Reviewed-by: mdoerr

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 1 new commit pushed to the master branch:

  • 372af6a: 8266490: Extend the OSContainer API to support the pids controller of cgroups

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 Jun 13, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 21, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 21, 2022

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

  • cb4e3fe: 8265100: (fs) WindowsFileStore.hashCode() should read cached hash code once
  • 97a472c: 8264400: (fs) WindowsFileStore equality depends on how the FileStore was constructed
  • aa35f09: 8139348: Deprecate 3DES and RC4 in Kerberos
  • 765c5b4: 8261160: Add a deserialization JFR event
  • 661236d: 8236823: Ensure that API documentation uses minified libraries
  • 8c37d06: 8226976: SessionTimeOutTests uses == operator for String value check
  • 674e717: 8220744: [TESTBUG] Move RedefineTests from runtime to serviceability
  • 9307c8c: 8217332: JTREG: Clean up, use generics instead of raw types
  • 9f059ee: 8213695: gc/TestAllocateHeapAtMultiple.java is slow in some configs
  • 1bdba34: 8219149: ProcessTools.ProcessBuilder should print timing info for subprocesses
  • ... and 12 more: https://git.openjdk.org/jdk11u-dev/compare/78aeb51960c36d4153c0a8c262776b7317a43f70...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 21, 2022
@openjdk openjdk bot closed this Jun 21, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 21, 2022
@GoeLin GoeLin deleted the goetz_backport_8281628 branch June 21, 2022 14:09
@openjdk
Copy link

openjdk bot commented Jun 21, 2022

@GoeLin Pushed as commit a2ecf87.

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