Fix evp SM cipherType check#6980
Merged
SparkiDev merged 2 commits intowolfSSL:masterfrom Nov 19, 2023
Merged
Conversation
SparkiDev
requested changes
Nov 16, 2023
Contributor
SparkiDev
left a comment
SparkiDev
left a comment
There was a problem hiding this comment.
CCM with SM4 as well.
Thanks.
Contributor
Author
|
I've updated the other section, not previously detected as there was a gating problem (also fixed). There's also a spelling correction in an |
SparkiDev
approved these changes
Nov 19, 2023
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
2 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.
Description
wolfcrypt evp.c appears to have an incorrect value for SM Ciphers during
ctx->cipherTypecheck. The gatingWOLFSSL_SM4_GCMis used, whereas I believe they need to be the macros in this PR.Edit: updates
wolfSSL_EVP_CIPHER_CTX_ctrl()forEVP_CTRL_AEAD_SET_TAGandEVP_CTRL_AEAD_GET_TAGconditions when using SM Ciphers withWOLFSSL_SM4_GCMand/orWOLFSSL_SM4_CCMenabled.Fixes zd# n/a
Testing
How did you test?
Tested only on embedded Espressif device.
Checklist