Skip to content

8293345: SunPKCS11 provider checks on PKCS11 Mechanism are problematic #3092

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

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 4, 2024

I backport this for parity with 17.0.15-oracle.

Config.java:
Resolve and adapt because of unsupported switch syntax.

SunPKCS11.java: I had to resolve becuase
"8301553: Support Password-Based Cryptography in SunPKCS11"
is not in 17. Context code has different control flow.
Patched code is unchanged.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8293345 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8343498 to be approved

Issues

  • JDK-8293345: SunPKCS11 provider checks on PKCS11 Mechanism are problematic (Enhancement - P3 - Approved)
  • JDK-8343498: SunPKCS11 provider checks on PKCS11 Mechanism are problematic (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3092/head:pull/3092
$ git checkout pull/3092

Update a local copy of the PR:
$ git checkout pull/3092
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3092/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3092

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3092.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 4, 2024

👋 Welcome back goetz! 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
Copy link

openjdk bot commented Dec 4, 2024

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

8293345: SunPKCS11 provider checks on PKCS11 Mechanism are problematic

Reviewed-by: mbaesken, mbalao

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

  • 4dc682a: 8324672: Update jdk/java/time/tck/java/time/TCKInstant.java now() to be more robust
  • 0ebe1e0: 8339261: Logs truncated in test javax/net/ssl/DTLS/DTLSRehandshakeTest.java
  • c15715a: 8337951: Test sun/security/validator/samedn.sh CertificateNotYetValidException: NotBefore validation
  • c665a75: 8339154: Cleanups and JUnit conversion of test/jdk/java/util/zip/Available.java
  • 2f7f75d: 8338668: Test javax/swing/JFileChooser/8080628/bug8080628.java doesn't test for GTK L&F
  • 37c1efa: 8335172: Add manual steps to run security/auth/callback/TextCallbackHandler/Password.java test
  • 98526a6: 8336012: Fix usages of jtreg-reserved properties
  • 3c7596f: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
  • 4f2f67d: 8334490: Normalize string with locale invariant toLowerCase()
  • 34d3185: 8327857: Remove applet usage from JColorChooser tests Test4222508
  • ... and 6 more: https://git.openjdk.org/jdk17u-dev/compare/ed63b718fe5b4e9f77154f6015516762800d13d6...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 changed the title Backport 1b476f52ba85f9ceaabe785d36cb07df831fd0e8 8293345: SunPKCS11 provider checks on PKCS11 Mechanism are problematic Dec 4, 2024
@openjdk
Copy link

openjdk bot commented Dec 4, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 4, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 6, 2024

Hi @martinuy
could you have a look at this change?
Thanks!

@openjdk
Copy link

openjdk bot commented Dec 6, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

Copy link
Contributor

@martinuy martinuy left a comment

Choose a reason for hiding this comment

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

Thanks for this contribution. Looks good to me.

@GoeLin
Copy link
Member Author

GoeLin commented Dec 9, 2024

Thanks for the reviews!

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Dec 9, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Dec 10, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

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

  • e29b061: 8340969: jdk/jfr/startupargs/TestStartDuration.java should be marked as flagless
  • ace471e: 8295087: Manual Test to Automated Test Conversion
  • 4dc682a: 8324672: Update jdk/java/time/tck/java/time/TCKInstant.java now() to be more robust
  • 0ebe1e0: 8339261: Logs truncated in test javax/net/ssl/DTLS/DTLSRehandshakeTest.java
  • c15715a: 8337951: Test sun/security/validator/samedn.sh CertificateNotYetValidException: NotBefore validation
  • c665a75: 8339154: Cleanups and JUnit conversion of test/jdk/java/util/zip/Available.java
  • 2f7f75d: 8338668: Test javax/swing/JFileChooser/8080628/bug8080628.java doesn't test for GTK L&F
  • 37c1efa: 8335172: Add manual steps to run security/auth/callback/TextCallbackHandler/Password.java test
  • 98526a6: 8336012: Fix usages of jtreg-reserved properties
  • 3c7596f: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
  • ... and 8 more: https://git.openjdk.org/jdk17u-dev/compare/ed63b718fe5b4e9f77154f6015516762800d13d6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 10, 2024

@GoeLin Pushed as commit 6f16a44.

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

@GoeLin GoeLin deleted the goetz_backport_8293345 branch December 10, 2024 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants