add cryptoCbSWFallback byte field #7079
Open
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
sotware fallback was used, fix ssl using software fallback even when WOLF_CRYPTO_CB_ONLY_RSA or WOLF_CRYPTO_CB_ONLY_ECC are defined
jpbland1
force-pushed
the
software-fallback-warning
branch
from
710ab41
to
00f4820
Compare
dgarske
requested changes
Jan 16, 2024
| @@ -9116,12 +9116,20 @@ static int check_cert_key(DerBuffer* cert, DerBuffer* key, void* heap, | |||
| ) { | |||
| ret = wc_CryptoCb_RsaCheckPrivKey((RsaKey*)pkey, | |||
| der->publicKey, der->pubKeySize); | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_RSA | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| ((RsaKey*)pkey)->cryptoCbSWFallback = 1; | |||
There was a problem hiding this comment.
Don't you need to check the value of ret to determine if fallback will be used?
| } | ||
| #endif | ||
| #ifdef HAVE_ECC | ||
| if (der->keyOID == ECDSAk) { | ||
| ret = wc_CryptoCb_EccCheckPrivKey((ecc_key*)pkey, | ||
| der->publicKey, der->pubKeySize); | ||
| #ifndef WOLF_CRYPTO_CB_ONLY_ECC | ||
| /* mark that fallback was used so the user can act accordingly */ | ||
| ((ecc_key*)pkey)->cryptoCbSWFallback = 1; |
There was a problem hiding this comment.
Don't you need to check the value of ret to determine if fallback will be used?
| if (ret == CRYPTOCB_UNAVAILABLE) | ||
| if ( | ||
| ret == CRYPTOCB_UNAVAILABLE | ||
| #if !defined(NO_RSA) && defined(WOLF_CRYPTO_CB_ONLY_RSA) |
There was a problem hiding this comment.
Add indentation here, so its easier to read
| @@ -5521,9 +5525,11 @@ static int _ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_ECC | |||
| if (err != CRYPTOCB_UNAVAILABLE) | |||
| return err; | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| @@ -6554,9 +6560,11 @@ int wc_ecc_sign_hash(const byte* in, word32 inlen, byte* out, word32 *outlen, | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_ECC | |||
| if (err != CRYPTOCB_UNAVAILABLE) | |||
| return err; | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| else | |||
| @@ -8280,9 +8288,11 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash, | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_ECC | |||
| if (err != CRYPTOCB_UNAVAILABLE) | |||
| return err; | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| else | |||
| @@ -3127,9 +3127,11 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out, | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_RSA | |||
| if (ret != CRYPTOCB_UNAVAILABLE) | |||
| return ret; | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| else | |||
| @@ -4759,9 +4761,11 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng) | |||
| #ifndef WOLF_CRYPTO_CB_ONLY_RSA | |||
| if (err != CRYPTOCB_UNAVAILABLE) | |||
| goto out; | |||
| /* mark that fallback was used so the user can act accordingly */ | |||
| else | |||
| @@ -284,6 +284,7 @@ struct Aes { | |||
| #ifdef WOLF_CRYPTO_CB | |||
| int devId; | |||
| void* devCtx; | |||
| byte cryptoCbSWFallback; | |||
There was a problem hiding this comment.
Please use bit-field byte cryptoCbSWFallback : 1;. Maybe use diff name like cbUsedSw?
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
add cryptoCbSWFallback byte field to mark when sotware fallback was used, fix ssl using software fallback even when WOLF_CRYPTO_CB_ONLY_RSA or WOLF_CRYPTO_CB_ONLY_ECC are defined
Testing
Tested with internal cryptocb project
Checklist