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

8274528: Add comment to explain an HKDF optimization in SSLSecretDerivation #5765

Closed
wants to merge 1 commit into from

Conversation

bradfordwetmore
Copy link
Contributor

@bradfordwetmore bradfordwetmore commented Sep 30, 2021

See comment, + a couple minor cleanups.


Progress

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

Issue

  • JDK-8274528: Add comment to explain an HKDF optimization in SSLSecretDerivation

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5765

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2021

👋 Welcome back wetmore! 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 added the rfr Pull request is ready for review label Sep 30, 2021
@openjdk
Copy link

openjdk bot commented Sep 30, 2021

@bradfordwetmore 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.

@openjdk openjdk bot added the security security-dev@openjdk.org label Sep 30, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2021

Webrevs

@@ -141,7 +150,7 @@ public SecretKey deriveKey(String algorithm,

private final byte[] label;

private SecretSchedule(String label) {
SecretSchedule(String label) {
Copy link
Member

@jnimeh jnimeh Sep 30, 2021

Choose a reason for hiding this comment

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

Why are we opening the visibility on this enum? As far as I can tell it is only ever referenced within the SSLSecretDerivation class and could remain private if it hasn't been causing any problems up to now.

Copy link
Contributor Author

@bradfordwetmore bradfordwetmore Sep 30, 2021

Choose a reason for hiding this comment

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

From the JLS §8.8.3: https://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.8.3

`
If no access modifier is specified for the constructor of an enum type, the constructor is private.
'

It's kind of like adding 'public' to interfaces. They're not necessary.

Does that alleviate your concern?

Copy link
Member

@jnimeh jnimeh Sep 30, 2021

Choose a reason for hiding this comment

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

Yes it does. I forgot that enums are private when there's no visibility explicitly stated. So given that the whole thing looks good to me.

jnimeh
jnimeh approved these changes Sep 30, 2021
Copy link
Member

@jnimeh jnimeh left a comment

Looks good.

@openjdk
Copy link

openjdk bot commented Sep 30, 2021

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

8274528: Add comment to explain an HKDF optimization in SSLSecretDerivation

Reviewed-by: jnimeh

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

  • bfd6163: 8274196: Crashes in VM_HeapDumper::work after JDK-8252842
  • bb95dda: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
  • 2f955d6: 8273142: Remove dependancy of TestHttpServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/http/ tests
  • 94e31e5: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • a8210c5: 8274401: C2: GraphKit::load_array_element bypasses Access API
  • dfc557c: 8274406: RunThese30M.java failed "assert(!LCA_orig->dominates(pred_block) || early->dominates(pred_block)) failed: early is high enough"
  • c0533ef: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah
  • f8415a9: 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah

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 Sep 30, 2021
@bradfordwetmore
Copy link
Contributor Author

bradfordwetmore commented Sep 30, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Sep 30, 2021

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

  • 9180d9a: 8273216: JCMD does not work across container boundaries with Podman
  • 3e0d7c3: 8270290: NTLM authentication fails if HEAD request is used
  • bfd6163: 8274196: Crashes in VM_HeapDumper::work after JDK-8252842
  • bb95dda: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
  • 2f955d6: 8273142: Remove dependancy of TestHttpServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/http/ tests
  • 94e31e5: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • a8210c5: 8274401: C2: GraphKit::load_array_element bypasses Access API
  • dfc557c: 8274406: RunThese30M.java failed "assert(!LCA_orig->dominates(pred_block) || early->dominates(pred_block)) failed: early is high enough"
  • c0533ef: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah
  • f8415a9: 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 30, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 30, 2021
@openjdk
Copy link

openjdk bot commented Sep 30, 2021

@bradfordwetmore Pushed as commit c57ed22.

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

@bradfordwetmore bradfordwetmore deleted the JDK-8274528 branch Nov 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
2 participants