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

8296442: EncryptedPrivateKeyInfo can be created with an uninitialized AlgorithmParameters #11067

Closed
wants to merge 6 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Nov 9, 2022

An EncryptedPrivateKeyInfo object can be created with an uninitialized AlgorithmParameters, but before you call getEncoded on it you need to remember to initialize the params. This is unfortunate but since this is a public API, I hesitate to make a change.

Instead, this code change fixes the much more widely used internal class AlgorithmId so that it cannot be created with an uninitialized AlgorithmParameters. EncryptedPrivateKeyInfo now works with both initialized and uninitialized params, and it's immutable.

No intention to make AlgorithmId immutable this time. It has a child class named AlgIdDSA which makes things complicated.


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-8296442: EncryptedPrivateKeyInfo can be created with an uninitialized AlgorithmParameters

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11067/head:pull/11067
$ git checkout pull/11067

Update a local copy of the PR:
$ git checkout pull/11067
$ git pull https://git.openjdk.org/jdk pull/11067/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11067

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11067.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 9, 2022

👋 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 openjdk bot added the rfr Pull request is ready for review label Nov 9, 2022
@openjdk
Copy link

openjdk bot commented Nov 9, 2022

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

@openjdk openjdk bot added the security security-dev@openjdk.org label Nov 9, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 9, 2022

Webrevs

Copy link
Member

@XueleiFan XueleiFan left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks!

@openjdk
Copy link

openjdk bot commented Nov 10, 2022

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

8296442: EncryptedPrivateKeyInfo can be created with an uninitialized AlgorithmParameters

Reviewed-by: xuelei, kdriver, 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 38 new commits pushed to the master branch:

  • 37848a9: 8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod
  • b3ef337: 8296960: [JVMCI] list HotSpotConstantPool.loadReferencedType to ConstantPool
  • f0474b8: 8283238: make/scripts/compare.sh should show the diff when classlist does not match
  • 04a4d34: 8297006: JFR: AbstractEventStream should not hold thread instance
  • 5db1b58: 8296961: [JVMCI] Access to j.l.r.Method/Constructor/Field for ResolvedJavaMethod/ResolvedJavaField
  • 4ce4f38: 8296958: [JVMCI] add API for retrieving ConstantValue attributes
  • 8c26d02: 8295315: [REDO] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files
  • 8752bb4: 8296818: Enhance JMH tests java/security/Signatures.java
  • b97fc93: 7132279: (ch) SeekableByteChannel operation may throw Non{Readable,Writable}ChannelException
  • 39dda24: 8157173: [macosx] java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails
  • ... and 28 more: https://git.openjdk.org/jdk/compare/d3051a75a37db5c8582c3040a220d15f4c29a851...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 Pull request is ready to be integrated label Nov 10, 2022
Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Still reviewing, but here are a few comments.

@seanjmullan
Copy link
Member

Did you consider changing EncryptedPrivateKeyInfo(...,AlgorithmParameters) to throw IllegalStateException if the parameters were not initialized? I know you said you were worried about changing the API, but it would be a cleaner option. I wonder if there is really any code that is initializing the parameters after creating the EPKI.

@wangweij
Copy link
Contributor Author

Did you consider changing EncryptedPrivateKeyInfo(...,AlgorithmParameters) to throw IllegalStateException if the parameters were not initialized? I know you said you were worried about changing the API, but it would be a cleaner option. I wonder if there is really any code that is initializing the parameters after creating the EPKI.

I thought about that. The change would break some existing tests and need a spec change. I don't think it's worth doing.

@wangweij
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 16, 2022

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

  • 37848a9: 8296967: [JVMCI] rationalize relationship between getCodeSize and getCode in ResolvedJavaMethod
  • b3ef337: 8296960: [JVMCI] list HotSpotConstantPool.loadReferencedType to ConstantPool
  • f0474b8: 8283238: make/scripts/compare.sh should show the diff when classlist does not match
  • 04a4d34: 8297006: JFR: AbstractEventStream should not hold thread instance
  • 5db1b58: 8296961: [JVMCI] Access to j.l.r.Method/Constructor/Field for ResolvedJavaMethod/ResolvedJavaField
  • 4ce4f38: 8296958: [JVMCI] add API for retrieving ConstantValue attributes
  • 8c26d02: 8295315: [REDO] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files
  • 8752bb4: 8296818: Enhance JMH tests java/security/Signatures.java
  • b97fc93: 7132279: (ch) SeekableByteChannel operation may throw Non{Readable,Writable}ChannelException
  • 39dda24: 8157173: [macosx] java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails
  • ... and 28 more: https://git.openjdk.org/jdk/compare/d3051a75a37db5c8582c3040a220d15f4c29a851...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 16, 2022
@openjdk openjdk bot closed this Nov 16, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 16, 2022
@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 16, 2022
@openjdk
Copy link

openjdk bot commented Nov 16, 2022

@wangweij Pushed as commit 68d3ed5.

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

@wangweij wangweij deleted the 8296442 branch November 16, 2022 20:31
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
4 participants