fix for new ECC ccb protection macros#136
Merged
billphipps merged 1 commit intowolfSSL:mainfrom Jul 29, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds protection macros for ECC cryptoCb functionality to prevent compilation errors when wolfHSM is compiled with wolfCrypt that has new ECC protection macros. The changes ensure that ECC-related functions are only compiled when the corresponding wolfCrypt features are enabled.
- Added conditional compilation guards around ECC-related function declarations and definitions
- Protected ECC functionality in both server and client crypto callback handlers
- Maintained backwards compatibility while fixing build issues with updated wolfCrypt
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/wh_server_crypto.c | Added HAVE_ECC_* macro guards around ECC function declarations, definitions, and switch cases |
| src/wh_client_cryptocb.c | Added HAVE_ECC_* macro guards around ECC case handlers in the crypto callback function |
billphipps
approved these changes
Jul 29, 2025
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
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.
Quick fix needed for wolfBoot release:
Upstream wolfCrypt added protection macros for ECC cryptoCb functionality, which now breaks wolfHSM.
Only added protection to the bare minimum required functions (those that touch protected wolfCrypt code), vs gating every wolfHSM API that has to do with those features, as some errors should instead be server runtime errors if server and client are configured differently.
And yes, keygen unfortunately is protected upstream by the
HAVE_ECC_DHEmacro, despite them being different things.