Update ECC public key check to use openssl3+ APIs #5691
Conversation
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
ColtonWilley
changed the title
EVP_PKEY_public_check() is an OpenSSL 3.0 API, not 1.1.1. Using S2N_OPENSSL_VERSION_AT_LEAST(1,1,1) caused build failures with AWS-LC since it reports as OpenSSL 1.1.1 compatible but doesn't have this function.
Author
|
@jouho I think the flag gating is finally correct. Please let me know if you need anything else on this PR. |
maddeleine
reviewed
Jan 15, 2026
|
|
||
| #ifdef S2N_LIBCRYPTO_SUPPORTS_EC_KEY_CHECK_FIPS | ||
| if (s2n_is_in_fips_mode()) { | ||
| RESULT_ENSURE(result == 1, S2N_ERR_ECDHE_INVALID_PUBLIC_KEY_FIPS); |
Contributor
There was a problem hiding this comment.
This is a little odd, it's not necessary to throw S2N_ERR_ECDHE_INVALID_PUBLIC_KEY_FIPS unless the libcrypto actually supports EC_KEY_check_fips. Like, the error is kind of meaningless unless that API is actually supported. You probably can just leave it out in the S2N_OPENSSL_VERSION_AT_LEAST(3, 0, 0) case since there's no equivalent for the EVP APIs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Goal
Refactor s2n_ecc_check_key() to use EVP APIs instead of direct EC_KEY APIs for public key validation.
Why
Existing methods to check EC public key are not provider enabled, breaking attempts to use an alternate crypto provider.
How
-Added new EVP-based s2n_ecc_check_key() implementation gated by EVP_APIS_SUPPORTED
-Uses EVP_PKEY_public_check() for key validation
-Returns FIPS-specific error code when s2n_is_in_fips_mode() is true
-Preserved EC_KEY fallback for older libcryptos
Testing
All existing ECC tests pass.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.