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

8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154 #15146

Closed
wants to merge 1 commit into from

Conversation

valeriepeng
Copy link

@valeriepeng valeriepeng commented Aug 3, 2023

This change addresses the scenario where a certificate is first stored as part of a certificate chain and then stored again as a certificate corresponding to a PrivateKey entry. Newer version of NSS errors out with CKR_GENERAL_ERROR with the 2nd store, i.e. C_CreateObject() call.

Proposed fix is to check for match before calling C_CreateObject(), if a match is found, set its alias instead.


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-8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15146

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 3, 2023

👋 Welcome back valeriep! 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 Aug 3, 2023
@openjdk
Copy link

openjdk bot commented Aug 3, 2023

@valeriepeng 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 Aug 3, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 3, 2023

Webrevs

@MBaesken
Copy link
Member

MBaesken commented Aug 4, 2023

Hi Valerie, we put the PR into our build/test queue to check if it solves some errors we currently notice in CertChainRemoval.java .

@valeriepeng
Copy link
Author

Hi Valerie, we put the PR into our build/test queue to check if it solves some errors we currently notice in CertChainRemoval.java .

Sure, thanks! What is the errors that you observed? Are you running against NSS and which version?

@MBaesken
Copy link
Member

MBaesken commented Aug 9, 2023

Hi Valerie, we put the PR into our build/test queue to check if it solves some errors we currently notice in CertChainRemoval.java .

Sure, thanks! What is the errors that you observed? Are you running against NSS and which version?

Looks like the errors are gone with your patch added.
Regarding NSS version, this is what rpm shows, I think this should be the version (on an RHEL 8.5 machine)

nss-3.67.0-7.el8_5.ppc64le

@valeriepeng
Copy link
Author

Hi Valerie, we put the PR into our build/test queue to check if it solves some errors we currently notice in CertChainRemoval.java .

Sure, thanks! What is the errors that you observed? Are you running against NSS and which version?

Looks like the errors are gone with your patch added. Regarding NSS version, this is what rpm shows, I think this should be the version (on an RHEL 8.5 machine)

nss-3.67.0-7.el8_5.ppc64le

Thanks for the confirmation! The next step is to find a reviewer for this PR then. ;)

@mrserb
Copy link
Member

mrserb commented Aug 10, 2023

Hi, @valeriepeng
On my system this test fails because the next exception, do you think it is related to this bug or the new one should be filed?:

Initial PKCS11 KeyStore: 
========
Add pk1, ca1 and root, then delete pk1
test CertChainRemoval.test(): failure
java.security.KeyStoreException: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_ATTRIBUTE_READ_ONLY
	at jdk.crypto.cryptoki/sun.security.pkcs11.P11KeyStore.engineSetEntry(P11KeyStore.java:1121)
	at jdk.crypto.cryptoki/sun.security.pkcs11.P11KeyStore.engineSetKeyEntry(P11KeyStore.java:462)
	at java.base/java.security.KeyStore.setKeyEntry(KeyStore.java:1192)
	at CertChainRemoval.main(CertChainRemoval.java:141)
	at PKCS11Test.premain(PKCS11Test.java:178)
	at PKCS11Test.testNSS(PKCS11Test.java:554)
	at PKCS11Test.main(PKCS11Test.java:214)
	at PKCS11Test.main(PKCS11Test.java:190)
	at CertChainRemoval.test(CertChainRemoval.java:77)

@valeriepeng
Copy link
Author

Hmm, does the test fail with the changes in this PR or without? Are you also using NSS and which version?

@openjdk
Copy link

openjdk bot commented Aug 11, 2023

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

8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154

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

  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
  • 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
  • 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
  • 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • ... and 191 more: https://git.openjdk.org/jdk/compare/bb3aac606397481cb4832cb75ec0a549d079ab13...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 Aug 11, 2023
@MBaesken
Copy link
Member

Looks okay to me and seems to fix the issues we faced in our test infrastructure; seems to need backport to jdk21.
Would be great to have a second reviewer who is working more actively in this area of the JDK codebase.

@mrserb
Copy link
Member

mrserb commented Aug 11, 2023

Hmm, does the test fail with the changes in this PR or without? Are you also using NSS and which version?

It fails with and w/o this patch, looks like related to the https://bugs.openjdk.org/browse/JDK-8232153

@valeriepeng
Copy link
Author

Looks okay to me and seems to fix the issues we faced in our test infrastructure; seems to need backport to jdk21. Would be great to have a second reviewer who is working more actively in this area of the JDK codebase.

Thanks for the review, I will ping my peers and see if any of them can get to this...

@valeriepeng
Copy link
Author

Hmm, does the test fail with the changes in this PR or without? Are you also using NSS and which version?

It fails with and w/o this patch, looks like related to the https://bugs.openjdk.org/browse/JDK-8232153

Hmm, does the test fail with the changes in this PR or without? Are you also using NSS and which version?

It fails with and w/o this patch, looks like related to the https://bugs.openjdk.org/browse/JDK-8232153

Yes, looks very likely to be related to that. I will check w/ Rajan also.

Copy link
Member

@jnimeh jnimeh left a comment

Choose a reason for hiding this comment

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

This looks good. Does the bug need a noreg label since this is addressing an existing test failure?

@valeriepeng
Copy link
Author

This looks good. Does the bug need a noreg label since this is addressing an existing test failure?

There is a test update with this bug id and no need to add noreg label. Rajan confirmed this as well. :)

@valeriepeng
Copy link
Author

Thanks for the review~

@valeriepeng
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 22, 2023

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

  • 9f4a9fe: 8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
  • 7c169a4: 8312232: Remove sun.jvm.hotspot.runtime.VM.buildLongFromIntsPD()
  • 2eae13c: 8214248: (fs) Files:mismatch spec clarifications
  • ce1ded1: 8314749: Remove unimplemented _Copy_conjoint_oops_atomic
  • 32bf468: 8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data
  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
  • ... and 196 more: https://git.openjdk.org/jdk/compare/bb3aac606397481cb4832cb75ec0a549d079ab13...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 22, 2023

@valeriepeng Pushed as commit ba6cdbe.

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

@valeriepeng valeriepeng deleted the JDK-8309214 branch August 22, 2023 23:50
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