Skip to content

Conversation

@mpdonova
Copy link
Contributor

@mpdonova mpdonova commented Nov 5, 2025

With the integration of JDK-8343232, this PR updates the Keytool/OpenSSL interop test to include a test case using PBMAC1.


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-8362894: PKCS12 KeyStore PBMAC1 interoperability testing (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28150

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 5, 2025

👋 Welcome back mdonovan! 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 Nov 5, 2025

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

8362894: PKCS12 KeyStore PBMAC1 interoperability testing

Reviewed-by: rhalade

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

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
Copy link

openjdk bot commented Nov 5, 2025

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

@@ -138,6 +138,11 @@ private static void generateInitialKeystores(String opensslPath)
"pass:changeit", "-certpbe", "AES-256-CBC", "-keypbe",
"AES-256-CBC", "-macalg", "SHA512")
.shouldHaveExitValue(0);

ProcessTools.executeCommand(opensslPath, "pkcs12", "-export", "-in",
Copy link
Member

Choose a reason for hiding this comment

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

nit: do you think it might be a good idea to bump the timeout by 10? As this command can take up to 10 seconds. Just to prevent future timeouts

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 6, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 6, 2025

Webrevs

@rhalade
Copy link
Member

rhalade commented Nov 19, 2025

thanks for addressing this gap. Please update test test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java to include bug id 8343232 in @bug list.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 19, 2025
@mpdonova
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 20, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 20, 2025

@mpdonova Pushed as commit b3acc48.

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

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 [email protected]

Development

Successfully merging this pull request may close these issues.

3 participants