Skip to content

fix for new ECC ccb protection macros#136

Merged
billphipps merged 1 commit intowolfSSL:mainfrom
bigbrett:fix-for-ccb-ecc-protection-macros
Jul 29, 2025
Merged

fix for new ECC ccb protection macros#136
billphipps merged 1 commit intowolfSSL:mainfrom
bigbrett:fix-for-ccb-ecc-protection-macros

Conversation

@bigbrett
Copy link
Contributor

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_DHE macro, despite them being different things.

@bigbrett bigbrett requested review from billphipps and Copilot July 29, 2025 19:46
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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 billphipps merged commit e0b2019 into wolfSSL:main Jul 29, 2025
6 checks passed
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.

3 participants