8281628: KeyAgreement : generateSecret intermittently not resetting #7665

wangweij · 2022-03-02T19:35:50Z

The comment said "pad it w/ leading 0s". So let's pad it.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8281628: KeyAgreement : generateSecret intermittently not resetting

Reviewers

Valerie Peng (@valeriepeng - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7665/head:pull/7665
$ git checkout pull/7665

Update a local copy of the PR:
$ git checkout pull/7665
$ git pull https://git.openjdk.java.net/jdk pull/7665/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7665

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7665.diff

8281628: KeyAgreement : generateSecret intermittently not resetting

bridgekeeper · 2022-03-02T19:36:29Z

👋 Welcome back weijun! 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 · 2022-03-02T19:38:14Z

@wangweij The following label will be automatically applied to this pull request:

security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2022-03-02T21:38:24Z

Webrevs

valeriepeng · 2022-03-02T21:47:06Z

src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java

        } else {
            // Array too short, pad it w/ leading 0s
            if (secret.length < expectedLen) {
+                Arrays.fill(sharedSecret, offset, offset + (expectedLen - secret.length), (byte)0);


nit: longer than 80 chars?

I'll wrap it.

valeriepeng · 2022-03-02T21:48:50Z

test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java

+ * @test
+ * @bug 8281628
+ * @library /test/lib
+ * @summary KeyAgreement : generateSecret intermittently not resetting


nit: describe the fix instead of just using the bug synopsis.

valeriepeng · 2022-03-02T21:57:08Z

test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java

+            aliceSecret[0] = 0;
+            bobSecret[0] = 1;


Instead of only the first byte difference, would it be easier to trigger the bug with completely different buffer value, say FFFFFF vs 000000?

Maybe not. When the generated secret is shorter, the padded bytes are always at the beginning.

With a bigger buffer, i.e. say 80-byte long, instead of 64-byte, I'd expect a difference and higher reproducibility...

After n = generateSecret(secret, offset) is called, only n bytes from offset should be touched, and in this case n is 64. Even if you allocate 80 bytes of data, we should not compare those after the 64th byte.

But you remind me I should not take it for granted that the return value is always 64 and it should be checked as well. A new commit pushed.

Hmm, I see, I confused the actual length with the buffer length. In the case where the generated bytes are shorter, the difference is only one byte, so setting other bytes do not matter.

valeriepeng

Changes look good.

openjdk · 2022-03-02T23:35:13Z

@wangweij 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:

8281628: KeyAgreement : generateSecret intermittently not resetting

Reviewed-by: valeriep

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

b6c35ae: 8209784: Include hsdis in the JDK
ce18ff8: 8282551: Properly initialize L32X64MixRandom state
234c17e: 8274788: Support archived heap objects in ParallelGC
fc918a7: 8281234: The -protected option is not always checked in keytool and jarsigner
d80f697: 8282523: Fix 'hierachy' typo
f12200c: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
12a822a: 8282381: Parallel: Remove unnecessary PCReferenceProcessor
ed3496e: 8282480: IGV: Use description instead of enum name for phases
fc52a21: 8282143: Objects.requireNonNull should be ForceInline
732d891: 8282411: Add useful predicates to ElementKind
... and 24 more: https://git.openjdk.java.net/jdk/compare/59b3ecc591ef6407d6b3f5532ecf889bf61339f0...master

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.

wangweij · 2022-03-03T00:38:05Z

/integrate

openjdk · 2022-03-03T00:39:52Z

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

b6c35ae: 8209784: Include hsdis in the JDK
ce18ff8: 8282551: Properly initialize L32X64MixRandom state
234c17e: 8274788: Support archived heap objects in ParallelGC
fc918a7: 8281234: The -protected option is not always checked in keytool and jarsigner
d80f697: 8282523: Fix 'hierachy' typo
f12200c: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
12a822a: 8282381: Parallel: Remove unnecessary PCReferenceProcessor
ed3496e: 8282480: IGV: Use description instead of enum name for phases
fc52a21: 8282143: Objects.requireNonNull should be ForceInline
732d891: 8282411: Add useful predicates to ElementKind
... and 24 more: https://git.openjdk.java.net/jdk/compare/59b3ecc591ef6407d6b3f5532ecf889bf61339f0...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-03-03T00:40:08Z

@wangweij Pushed as commit 1485883.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8281628: KeyAgreement : generateSecret intermittently not resetting

1ee9eb4

8281628: KeyAgreement : generateSecret intermittently not resetting

openjdk bot added the security security-dev@openjdk.org label Mar 2, 2022

remove x bits

92ada68

openjdk bot added the rfr Pull request is ready for review label Mar 2, 2022

valeriepeng reviewed Mar 2, 2022

View reviewed changes

wangweij added 2 commits March 2, 2022 17:31

wrap and comment

68dc51e

check length as well

5fb6707

valeriepeng approved these changes Mar 2, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 2, 2022

openjdk bot added the integrated Pull request has been integrated label Mar 3, 2022

openjdk bot closed this Mar 3, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 3, 2022

wangweij deleted the 8281628 branch March 5, 2022 15:41

8281628: KeyAgreement : generateSecret intermittently not resetting #7665

8281628: KeyAgreement : generateSecret intermittently not resetting #7665

Uh oh!

Conversation

wangweij commented Mar 2, 2022 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Mar 2, 2022

Uh oh!

openjdk bot commented Mar 2, 2022

Uh oh!

mlbridge bot commented Mar 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wangweij Mar 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

valeriepeng left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Mar 2, 2022

Uh oh!

wangweij commented Mar 3, 2022

Uh oh!

openjdk bot commented Mar 3, 2022

Uh oh!

openjdk bot commented Mar 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

wangweij commented Mar 2, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 2, 2022 •

edited

Loading

wangweij Mar 2, 2022 •

edited

Loading