Add CryptoCb features #6636
Merged
Add CryptoCb features #6636
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
|
I still owe a build option here. |
dgarske
requested changes
Jul 19, 2023
dgarske
requested changes
Jul 26, 2023
wolfcrypt/src/cryptocb.c
Outdated
| @@ -223,11 +252,28 @@ static WC_INLINE int wc_CryptoCb_TranslateErrorCode(int ret) | |||
| return ret; | |||
| } | |||
|
|
|||
| /* Helper function to reset a device entry to invalid */ | |||
| static inline void wc_CryptoCb_ClearDev(CryptoCb *dev) | |||
There was a problem hiding this comment.
Consider WC_INLINE vs inline. Portability.
wolfcrypt/src/cryptocb.c
Outdated
| @@ -255,6 +301,8 @@ void wc_CryptoCb_SetDeviceFindCb(CryptoDevCallbackFind cb) | |||
|
|
|||
| int wc_CryptoCb_RegisterDevice(int devId, CryptoDevCallbackFunc cb, void* ctx) | |||
| { | |||
| int rc=0; | |||
There was a problem hiding this comment.
Please use spaces around =. There are several places.
wolfcrypt/src/cryptocb.c
Outdated
| #ifdef WOLF_CRYPTO_CB_CMD | ||
| if (dev->cb != NULL) { | ||
| /* Invoke callback with unregister command.*/ | ||
| wc_CryptoInfo info= {0}; |
There was a problem hiding this comment.
Prefer an XMEMSET for portability. The = {0} is not perfectly portable.
wolfcrypt/src/cryptocb.c
Outdated
| #ifdef WOLF_CRYPTO_CB_CMD | ||
| if (cb != NULL) { | ||
| /* Invoke callback with register command */ | ||
| wc_CryptoInfo info= {0}; |
There was a problem hiding this comment.
Prefer an XMEMSET for portability. The = {0} is not perfectly portable.
dgarske
approved these changes
Jul 27, 2023
| else if ((rc == CRYPTOCB_UNAVAILABLE) || | ||
| (rc == NOT_COMPILED_IN)) { | ||
| /* Not implemented. Return success*/ | ||
| rc = 0; |
There was a problem hiding this comment.
Thank you for this. It enables backwards compatibility when WOLF_CRYPTO_CB_CMD is defined. I tested this with and without using wolfTPM's TLS crypto callback examples and all works!
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
Added additional cryptocb features:
Testing
This was tested using the out-of-tree VaultIC 420 porting library. The current cryptocb test passed within test and the cleanup is being called automatically.
Checklist