feat: Add additional EC key validation for FIPS #4452
Merged
Conversation
This file contains 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
goatgoose
force-pushed
the
fips-ec-check
branch
2 times, most recently
from
3cf7a0e to
7a48299
Compare
goatgoose
force-pushed
the
fips-ec-check
branch
from
7a48299 to
24afd67
Compare
lrstewart
reviewed
Mar 12, 2024
lrstewart
reviewed
Mar 13, 2024
goatgoose
force-pushed
the
fips-ec-check
branch
from
02941cd to
30bc322
Compare
goatgoose
force-pushed
the
fips-ec-check
branch
from
30bc322 to
746381c
Compare
lrstewart
approved these changes
Mar 14, 2024
tests/unit/s2n_ecc_evp_test.c
Outdated
Comment on lines
480
to
484
| if (s2n_is_in_fips_mode() && s2n_libcrypto_supports_ec_key_check_fips()) { | ||
| EXPECT_FAILURE_WITH_ERRNO(ret, S2N_ERR_ECDHE_INVALID_PUBLIC_KEY_FIPS); | ||
| } else { | ||
| EXPECT_FAILURE_WITH_ERRNO(ret, S2N_ERR_ECDHE_INVALID_PUBLIC_KEY); | ||
| } |
There was a problem hiding this comment.
I still don't know that I love this trick, but it does work?
There was a problem hiding this comment.
Yeah... I'm not really sure it's worth it. If you think it's better without it let me know and I will remove it. I think the test itself is worth keeping either way though, since the call to EC_KEY_check_key isn't currently being tested.
Unfortunately the debug line hack won't work either, since it requires different builds (AWS-LC vs AWS-LC-FIPS), so we can't compare the two line numbers.
jmayclin
approved these changes
Mar 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes:
The EC_KEY_check_key libcrypto API is used in s2n-tls to validate the public key received from the peer. Some libcryptos, such as AWS-LC, provide another API: EC_KEY_check_fips, which includes the validation performed by
EC_KEY_check_keyas well as additional validation for FIPS.This PR calls the
EC_KEY_check_fipsAPI instead ofEC_KEY_check_keywhen s2n-tls is operating in FIPS mode.Call-outs:
EC_KEY_check_fipsisn't defined in all libcryptos, so a new feature probe was added.Testing:
A new test was added to ensure that the feature probe is working correctly.
Performance:
I ran benchmarks to determine the performance impact of this change with AWS-LC-FIPS-2022. I used this s2n_perf unit test to get results. I ran each operation for 10 minutes.
While this change did significantly impact the performance of
s2n_ecc_evp_compute_shared_secret_from_params, this is such a small part of the handshake that there wasn't really a noticeable change.generate vs compute_shared_secret comparison:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.