Allow ecc preferences without secp256r1 #2763
Merged
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
alexw91
approved these changes
Apr 24, 2021
zz85
approved these changes
Apr 24, 2021
xonatius
reviewed
Apr 24, 2021
Comment on lines
+251
to
+253
| /* P-256 is the preferred fallback option. These prefs don't support it, so choose whatever curve is first. */ | ||
| conn->secure.server_ecc_evp_params.negotiated_curve = ecc_pref->ecc_curves[0]; |
There was a problem hiding this comment.
Is it guaranteed that we always have at least one curve?
There was a problem hiding this comment.
I think we need a defensive check. Can add one to the conditional here but also thinking of other places to have the check to short circuit this logic sooner.
There was a problem hiding this comment.
Added a sanity check during s2n_security_policies_init() where @zz85's previous p256 check was.
There was a problem hiding this comment.
Maybe POSIX_ENSURE_GT(ecc_pref->count, 0); for extra paranoia? (:
There was a problem hiding this comment.
decided to put that check with the rest of the ecc_pref validations in this function rather than nested in the conditional where we access the first element.
This change preserves the previous ecc fallback behavior while allowing for a preference list that does not contain secp256r1.
xonatius
approved these changes
Apr 26, 2021
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.
This change preserves the previous ecc fallback behavior while
allowing for a preference list that does not contain secp256r1.