Closed
Conversation
levitte
previously requested changes
Mar 19, 2018
|
|
||
| static int key_disabled(EVP_PKEY *pkey) | ||
| { | ||
| #if defined(OPENSSL_NO_SM2) && !defined(OPENSSL_NO_EC) |
Member
There was a problem hiding this comment.
I think this line could do with a little bit more bang (!)
Member
Author
There was a problem hiding this comment.
No - this is correct. If we have asked for sm2 to be disabled, but ec is still enabled then we may end up reading ec keys with an sm2 group. We need to detect those and ignore them.
Contributor
There was a problem hiding this comment.
Would an easier solution be to not add the NID_sm2 to the curve_list[] in ec_curve.c?
levitte
approved these changes
Mar 19, 2018
Contributor
|
I was about to make a similar fix |
Contributor
|
I have some additional fixes related to SM2 and no-sm3. |
Member
Author
|
Pushed. Thanks.
Great. Anything urgent, or can it wait until after the beta? |
levitte
pushed a commit
that referenced
this pull request
Mar 19, 2018
Reviewed-by: Richard Levitte <[email protected]> (Merged from #5673)
levitte
pushed a commit
that referenced
this pull request
Mar 19, 2018
Reviewed-by: Richard Levitte <[email protected]> (Merged from #5673)
Contributor
|
I think this should be closed? |
Member
Author
|
Oh, right! Yes - thanks. This was merged. |
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
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.
We broke no-ec again. I only just fixed it this morning :-)
This PR is mainly about fixing no-sm2, and then if no-ec is requested then this implies no-sm2.
Checklist