Skip to content

Conversation

valeriepeng
Copy link
Contributor

@valeriepeng valeriepeng commented Oct 2, 2025

This PR updates the cipher transformation parsing and verification logic to be stricter and throws NoSuchAlgorithmException (NSAE) when additional slash(es) is found. With the existing parsing logic, the extra slash(es) is likely to end up in the last component, i.e. the padding scheme, and lead to NoSuchPaddingException (NSPE) from the underlying CipherSpi object.

Out of the supported cipher algorithms for all JDK providers, PBES2 cipher algorithms and RSA cipher with OAEP paddings may contain truncated SHA-512 in their transformations. This proposed fix would check for truncated SHA in both algorithm and padding schemes and throws NSAE if any extra slash is found.

Thanks in advance for the review~


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-8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27615

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2025

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

openjdk bot commented Oct 2, 2025

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

8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE

Reviewed-by: weijun

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 123 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 Oct 2, 2025

@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 rfr Pull request is ready for review label Oct 2, 2025
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2025

Webrevs

sha512Idx = transformation.indexOf(SHA512TRUNCATED, sha512SlashIdx +
SHA512TRUNCATED.length());
sha512SlashIdx = (sha512Idx != -1 ? sha512Idx + 3 : -2);
}
Copy link
Contributor

@wangweij wangweij Oct 3, 2025

Choose a reason for hiding this comment

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

The logic is quite complex. Can you create a dedicated method for it like indexOfRealSlashIn(String s)?

We can even call it on the mode part.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are quite a few values being updated here, that's why I didn't make it into a method initially. Let me think about it more...

Copy link
Contributor

Choose a reason for hiding this comment

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

Both sha512Idx and sha512SlashIdx locally assigned, SHA512TRUNCATED is a constant, transformation is not mutated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did refactoring it using a record. If we apply the same method on mode as well, then the flow is simplified even though the mode should not contain truncated algorithms.


private static final String SHA512TRUNCATED = "SHA512/2";
// for special handling SHA-512/224, SHA-512/256, SHA512/224, SHA512/256
private static final String SHA512TRUNCATED = "512/2";
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this constant still used?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, I've removed it in the last commit.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 7, 2025
@valeriepeng
Copy link
Contributor Author

Thanks for the review~

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Pull request is ready to be integrated rfr Pull request is ready for review security [email protected]
Development

Successfully merging this pull request may close these issues.

2 participants