Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cryptoCb cipher macro #65

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

bigbrett
Copy link
Contributor

Fixes missing macro protection

wolfCrypt guards the definition of wcCryptoInfo->cipher by #if !defined(NO_AES) || !defined(NO_DES3), but wolfHSM doesn't, resulting in a compile error when using wolfCrypt with no support for those algos (e.g. default wolfBoot)

Copy link
Contributor

@jpbland1 jpbland1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are non aes ciphers within cryptocb, cha cha comes to mind, that we'll support when a customer requests it so the top level cipher shouldn't be linked to aes

@bigbrett
Copy link
Contributor Author

There are non aes ciphers within cryptocb, cha cha comes to mind, that we'll support when a customer requests it so the top level cipher shouldn't be linked to aes

The point is we aren't guarding it the same as the definition of the struct in cryptocb.h. This just protects our cryptocb's usage of that struct using the same macros as the definition

@jpbland1
Copy link
Contributor

nevermind, I had it wrong, looks good

@jpbland1 jpbland1 self-requested a review August 13, 2024 17:06
Copy link
Contributor

@jpbland1 jpbland1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@jpbland1 jpbland1 merged commit fc9b2f9 into wolfSSL:main Aug 13, 2024
1 check passed
jefferyq2 pushed a commit to jefferyq2/wolfHSM that referenced this pull request Nov 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants