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

8285683: Missing @ since 11 in java.security.spec.MGF1ParameterSpec fields #8411

Closed
wants to merge 5 commits into from

Conversation

bradfordwetmore
Copy link
Contributor

@bradfordwetmore bradfordwetmore commented Apr 26, 2022

Two new constant fields MGF1ParameterSpec.SHA512_224 and MGF1ParameterSpec.SHA512_256 didn't have @since 11 tag added as part of JDK-8146293.

This bug addresses this issue.


Progress

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

Issue

  • JDK-8285683: Missing @ since 11 in java.security.spec.MGF1ParameterSpec fields

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8411

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 26, 2022

👋 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 label Apr 26, 2022
@openjdk
Copy link

openjdk bot commented Apr 26, 2022

@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 label Apr 26, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 26, 2022

Webrevs

Copy link

@valeriepeng valeriepeng left a comment

Looks good. Thanks~

@openjdk
Copy link

openjdk bot commented Apr 27, 2022

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

8285683: Missing @ since 11 in java.security.spec.MGF1ParameterSpec fields

Reviewed-by: hchao, valeriep, xuelei, mullan

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

  • 5c09349: 8285032: vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/ fails with "eventSet.suspendPolicy() != policyExpected"
  • 1f868f1: 8285658: Fix two typos in the spec of j.u.random.RandomGenerator
  • 8a16842: 8176501: Method Shape.getBounds2D() incorrectly includes Bezier control points in bounding box
  • 05dac5a: 8280468: Crashes in getConfigColormap, getConfigVisualId, XVisualIDFromVisual on Linux
  • 6db2e16: 8284077: Create an automated test for JDK-4170173
  • a0b984a: 8282933: Create a test for JDK-4529616
  • 716a80a: 8283179: SA tests fail with "ERROR: catch_mach_exception_raise: Message doesn't denote a Unix soft signal."
  • 6c79671: 8285633: Take better advantage of generic MethodType cache
  • 5b42747: 8285736: JDK-8236128 causes validate-source failures
  • 6ce4e75: 8284726: Print active locale settings in hs_err reports and in VM.info
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/e574cc0e2b3330daf7494b809a06b12f2c875916...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.

@openjdk openjdk bot added the ready label Apr 27, 2022
@valeriepeng
Copy link

valeriepeng commented Apr 27, 2022

Is a CSR needed?

@bradfordwetmore
Copy link
Contributor Author

bradfordwetmore commented Apr 27, 2022

Is a CSR needed?

@valeriepeng I would be surprised. I don't think so, but checking with CSR.

@@ -96,12 +96,16 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {

/**
* The MGF1ParameterSpec which uses SHA-512/224 message digest
Copy link
Member

@seanjmullan seanjmullan Apr 27, 2022

Choose a reason for hiding this comment

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

Feel free to cover this as a separate issue, but I think these constant descriptions should end with a period. Also, I would say "... uses a SHA-512/224 message digest." (change in italics). There is also some inconsistency in the constants, some put the digest algorithm in double-quotes while others don't - it would be good to be consistent.

Copy link
Contributor Author

@bradfordwetmore bradfordwetmore Apr 27, 2022

Choose a reason for hiding this comment

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

Updated for consistency.

@@ -65,76 +65,90 @@
public class MGF1ParameterSpec implements AlgorithmParameterSpec {

/**
* The MGF1ParameterSpec which uses "SHA-1" message digest
* The <code>MGF1ParameterSpec</code> which uses a "SHA-1" message digest.
Copy link
Member

@seanjmullan seanjmullan Apr 27, 2022

Choose a reason for hiding this comment

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

Nit, use {@code} instead of <code/>. Otherwise, looks good.

@bradfordwetmore
Copy link
Contributor Author

bradfordwetmore commented Apr 27, 2022

/integrate

1 similar comment
@bradfordwetmore
Copy link
Contributor Author

bradfordwetmore commented Apr 27, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 27, 2022

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

  • 3312d8c: 8285756: clean up use of bad arguments for @clean in langtools tests
  • 5c09349: 8285032: vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/ fails with "eventSet.suspendPolicy() != policyExpected"
  • 1f868f1: 8285658: Fix two typos in the spec of j.u.random.RandomGenerator
  • 8a16842: 8176501: Method Shape.getBounds2D() incorrectly includes Bezier control points in bounding box
  • 05dac5a: 8280468: Crashes in getConfigColormap, getConfigVisualId, XVisualIDFromVisual on Linux
  • 6db2e16: 8284077: Create an automated test for JDK-4170173
  • a0b984a: 8282933: Create a test for JDK-4529616
  • 716a80a: 8283179: SA tests fail with "ERROR: catch_mach_exception_raise: Message doesn't denote a Unix soft signal."
  • 6c79671: 8285633: Take better advantage of generic MethodType cache
  • 5b42747: 8285736: JDK-8236128 causes validate-source failures
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/e574cc0e2b3330daf7494b809a06b12f2c875916...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 27, 2022
@openjdk openjdk bot closed this Apr 27, 2022
@openjdk openjdk bot removed ready rfr labels Apr 27, 2022
@openjdk
Copy link

openjdk bot commented Apr 27, 2022

@bradfordwetmore Pushed as commit cf1b00a.

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

@openjdk
Copy link

openjdk bot commented Apr 27, 2022

@bradfordwetmore The command integrate can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated security
5 participants