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

8296901: Do not create unsigned certificate and CRL #11151

Closed
wants to merge 5 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Nov 15, 2022

Instead if creating an "unsigned" X509CertImpl with only an X509CertInfo inside, a new static method signNew is introduced to create a newly signed certificate from an X509CertInfo object and a PrivateKey. Thus make sure an X509CertImpl is always signed and there is no read to keep its readOnly flag.

The same for X509CRLImpl. A new inner class TBSCertList is added which is equivalent to X509CertInfo inside X509CertImpl.


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-8296901: Do not create unsigned certificate and CRL

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11151

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 15, 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.

*/
private X509CRLImpl() { }
public X509CRLImpl(TBSCertList info, AlgorithmId sigAlgId, byte[] signature,
byte[] tbsCertList, byte[] signedCRL) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

In fact, all arguments must be non null. Only the last one is checked to emphasize that the encoding must be provided. This constructor is also used in tests to create fake CRLs where not all fields are available.

*/
public X509CertImpl() { }
public X509CertImpl(X509CertInfo info, AlgorithmId algId, byte[] signature,
byte[] signedCert) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

In fact, all arguments must be non null. Only the last one is checked to emphasize that the encoding must be provided. This constructor is also used in tests to create fake certificates where not all fields are available.

@openjdk
Copy link

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

mlbridge bot commented Nov 15, 2022

Webrevs

@@ -1351,7 +1321,7 @@ private static Collection<List<?>> cloneAltNames(Collection<List<?>> altNames) {
public synchronized Collection<List<?>> getSubjectAlternativeNames()
throws CertificateParsingException {
// return cached value if we can
if (readOnly && subjectAlternativeNames != null) {
if (subjectAlternativeNames != null) {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (subjectAlternativeNames != null) {
if (subjectAlternativeNames != null) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Didn't notice that. Will fix. Thanks.

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.

Wondering why you named the methods "signNew" instead of just "sign" which seems simpler to me.
Otherwise looks fine.

@openjdk
Copy link

openjdk bot commented Nov 17, 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:

8296901: Do not create unsigned certificate and CRL

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

  • 7b3984c: 8296463: Memory leak in JVM_StartThread with the integration of Virtual threads
  • 373e52c: 8296785: Use realloc for CHeap-allocated BitMaps
  • a53be20: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 66228f7: 8297074: Use enhanced-for cycle instead of Enumeration in javax.crypto
  • 819af69: 8249693: java/nio/channels/FileChannel/FileExtensionAndMap.java uses @ignore w/o bug id
  • 9c432a0: 8297165: Update Pandoc to version 2.19.2 for Oracle builds
  • 8b140e2: 8297152: Add a @sealedGraph tag to ZoneId
  • 992f209: 8287180: Update IANA Language Subtag Registry to Version 2022-08-08
  • a768fed: 8297184: Test runtime/ErrorHandling/TestSigInfoInHsErrFile.java is failing
  • 134acab: 8297149: REDO JDK-8296889: Race condition when cancelling a request
  • ... and 75 more: https://git.openjdk.org/jdk/compare/2f7dc5c4cde32978c46d092d593c5c76df1edc18...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 17, 2022
@wangweij
Copy link
Contributor Author

Wondering why you named the methods "signNew" instead of just "sign" which seems simpler to me.
Otherwise looks fine.

I just want to emphasize that a new object is created. If we can use "new" as a verb, maybe "newSigned" is better. I can revert to "sign" if you think they sound weird.

@seanjmullan
Copy link
Member

Not worth spending too many cycles because it is internal code. Maybe newSignedCert. I'm ok with whatever you decide.

@wangweij
Copy link
Contributor Author

I chose newSigned. Same method name for both certificate and CRL.

@wangweij
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 18, 2022

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

  • 7b3984c: 8296463: Memory leak in JVM_StartThread with the integration of Virtual threads
  • 373e52c: 8296785: Use realloc for CHeap-allocated BitMaps
  • a53be20: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 66228f7: 8297074: Use enhanced-for cycle instead of Enumeration in javax.crypto
  • 819af69: 8249693: java/nio/channels/FileChannel/FileExtensionAndMap.java uses @ignore w/o bug id
  • 9c432a0: 8297165: Update Pandoc to version 2.19.2 for Oracle builds
  • 8b140e2: 8297152: Add a @sealedGraph tag to ZoneId
  • 992f209: 8287180: Update IANA Language Subtag Registry to Version 2022-08-08
  • a768fed: 8297184: Test runtime/ErrorHandling/TestSigInfoInHsErrFile.java is failing
  • 134acab: 8297149: REDO JDK-8296889: Race condition when cancelling a request
  • ... and 75 more: https://git.openjdk.org/jdk/compare/2f7dc5c4cde32978c46d092d593c5c76df1edc18...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 18, 2022

@wangweij Pushed as commit ab6b7ef.

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

@wangweij wangweij deleted the 8296901 branch November 18, 2022 02:22
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
3 participants