Repository navigation
Conversation
When using encrypted ext flash, wolfssl/types.h is included. That already defines XMEMCPY, XMEMCMP and XMEMSET, so there's no need for this fallback mechanism
vhdirk
changed the title
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The fallback is disabled for encrypted BUILD_TOOL builds, leaving XMEMCPY unresolved and breaking the non-MMU UART flash server build with ENCRYPT=1 and NVM_FLASH_WRITEONCE=1.
1 open issue
What changed in this PR
This PR aims to prevent fallback memory macros from conflicting with wolfSSL definitions when external-flash encryption is enabled.
Changes:
- Adds an
EXT_ENCRYPTEDcheck to the fallback macro guard inlibwolfboot.c.
| File | Description |
|---|---|
src/libwolfboot.c |
Skips fallback memory macro definitions when EXT_ENCRYPTED is defined. |
Review effort: Balanced
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
dgarske
approved these changes
Nov 5, 2026
dgarske
left a comment
dgarske
left a comment
Member
There was a problem hiding this comment.
Okay to test. Contributor agreement on file for customer.
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.
When using encrypted ext flash, wolfssl/types.h is included. That defines XMEMCPY, XMEMCMP and XMEMSET, but only after the fallback definitions here.