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

8335288: SunPKCS11 initialization will call C_GetMechanismInfo on unsupported mechanisms #1283

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 22, 2024

I backport this for parity with 21.0.7-oracle.

I removed brokenMechanisms.contains() from the code. brokenMechanisms
was introduced by https://bugs.openjdk.org/browse/JDK-8324585 which is not
in 21. But this is a change that might be backported at some point, so I
think we should leave the code in there so that it's easier to recover it
in this case. I also wrote a note in 8324585 to do so.


Progress

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

Issue

  • JDK-8335288: SunPKCS11 initialization will call C_GetMechanismInfo on unsupported mechanisms (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1283

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 22, 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 22, 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:

8335288: SunPKCS11 initialization will call C_GetMechanismInfo on unsupported mechanisms

Reviewed-by: mdoerr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 fdfe503d016086cf78b5a8c27dbe45f0261c68ab 8335288: SunPKCS11 initialization will call C_GetMechanismInfo on unsupported mechanisms Dec 22, 2024
@openjdk
Copy link

openjdk bot commented Dec 22, 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 22, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 22, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 23, 2024

GHA failures: three times wget failed. Unrelated.

@TheRealMDoerr
Copy link
Contributor

Makes sense. Is there a problem with the test RequiredMechCheck.java in 21u or why did you omit it?

@GoeLin
Copy link
Member Author

GoeLin commented Dec 23, 2024

Oh, I just forgot git add. Thanks for noting. Fixed. I'll run it through our testing once more.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Dec 23, 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.

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

GoeLin commented Dec 24, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 24, 2024

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

  • bf86b34: 8328553: Get rid of JApplet in test/jdk/sanity/client/lib/SwingSet2/src/DemoModule.java
  • 173c3d3: 8333647: C2 SuperWord: some additional PopulateIndex tests
  • 3aa331d: 8326421: Add jtreg test for large arrayCopy disjoint case.
  • f3e7bb4: 8329210: Delete Redundant Printer Dialog Modality Test
  • d91dba3: 8315883: Open source several Swing JToolbar tests
  • a98f9cf: 8316056: Open source several Swing JTree tests

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 24, 2024

@GoeLin Pushed as commit 85e5a5c.

💡 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_8335288 branch December 24, 2024 11:19
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.

2 participants