Skip to content

8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms#336

Open
rm-gh-8 wants to merge 1 commit intoopenjdk:masterfrom
rm-gh-8:JDK-8373690-V25
Open

8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms#336
rm-gh-8 wants to merge 1 commit intoopenjdk:masterfrom
rm-gh-8:JDK-8373690-V25

Conversation

@rm-gh-8
Copy link
Contributor

@rm-gh-8 rm-gh-8 commented Mar 2, 2026

Backporting JDK-8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms.

This PR improves error messaging in KeyStore.getInstance(File, ...) methods to distinguish between "unrecognized keystore format" and "keystore format disabled by security policy" when auto-detecting keystore types from files.

For parity with Oracle JDK.

Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

make test TEST=test/jdk/java/security/KeyStore/DisabledKnownType.java

Results attached:

windows-x64-specific-test.log
macos-aarch64-specific-test.log
linux-x64-specific-test.log
linux-aarch64-specific-test.log


Progress

  • JDK-8373690 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms (Bug - P4 - Requested)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 336

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 2, 2026

👋 Welcome back rm-gh-8! 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 Mar 2, 2026

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport e92726c352f2d9e9ccb074441d9c09eef781a492 8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms Mar 2, 2026
@openjdk
Copy link

openjdk bot commented Mar 2, 2026

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Mar 2, 2026
@rm-gh-8 rm-gh-8 marked this pull request as ready for review March 3, 2026 16:24
@openjdk
Copy link

openjdk bot commented Mar 3, 2026

⚠️ @rm-gh-8 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 the rfr Pull request is ready for review label Mar 3, 2026
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Mar 3, 2026

/approval request for backport of JDK-8373690: Unexpected Keystore message using jdk.crypto.disabledAlgorithms.

This PR improves error messaging in KeyStore.getInstance(File, ...) methods to distinguish between "unrecognized keystore format" and "keystore format disabled by security policy" when auto-detecting keystore types from files.

For parity with Oracle JDK.

Low Risk - it only changes error message generation logic in the file-based keystore detection path, providing more specific exception messages when a keystore type is detected but disabled by jdk.crypto.disabledAlgorithms property, without altering any core keystore functionality or security behavior.

@openjdk
Copy link

openjdk bot commented Mar 3, 2026

@rm-gh-8
8373690: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Mar 3, 2026
@mlbridge
Copy link

mlbridge bot commented Mar 3, 2026

Webrevs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval Requires approval; will be removed when approval is received backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

1 participant