Validate XDH native secret derivation#1480
Open
taoliult wants to merge 2 commits into
Open
Conversation
Add return-code checks for the native XDH secret derivation path, including ICC_EVP_PKEY_derive_init, ICC_EVP_PKEY_derive_set_peer, and the ICC_EVP_PKEY_derive call used to query the secret length. Also validate the derived secret length against the allocated Java byte array length before returning the result. Signed-off-by: Tao Liu <tao.liu@ibm.com>
taoliult
requested review from
JinhangZhang,
KostasTsiounis,
jasonkatonica and
johnpeck-us-ibm
johnpeck-us-ibm
approved these changes
May 21, 2026
taoliult
force-pushed
the
java25_dump
branch
2 times, most recently
from
22a164c to
93c9356
Compare
Set the expected XEC secret buffer size explicitly on z/OS before calling the native ECDH secret computation. On other platforms, the native layer can query the required secret size by calling ICC_EVP_PKEY_derive. However, this size query does not work on z/OS. To handle this platform difference, determine the curve name from the public key parameters on z/OS and pass the expected secret buffer size to the native layer. Other platforms continue to use the ICC_EVP_PKEY_derive size query. Signed-off-by: Tao Liu <tao.liu@ibm.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add return-code checks for the native XDH secret derivation path, including ICC_EVP_PKEY_derive_init, ICC_EVP_PKEY_derive_set_peer, and the ICC_EVP_PKEY_derive call used to query the secret length.
This is a back port PR from PR: #1411