Fix SHE master ECU key fallback writing metadata to wrong variable#294
Merged
bigbrett merged 1 commit intowolfSSL:mainfrom Mar 2, 2026
Merged
Fix SHE master ECU key fallback writing metadata to wrong variable#294bigbrett merged 1 commit intowolfSSL:mainfrom
bigbrett merged 1 commit intowolfSSL:mainfrom
Conversation
In wh_Server_KeystoreReadKey, the SHE master ECU key fallback path (when the key is not found in cache or NVM) correctly zeroed outMeta but then wrote len and id to the local stack variable `meta` instead of the caller's output parameter `outMeta`. This left the caller with a zeroed metadata struct (len=0, id=0), contradicting the intended behavior of returning WH_SHE_KEY_SZ and the correct keyId. Also fix two related issues in the same function: - Use sizeof(*outMeta) instead of sizeof(meta) in memset/memcpy calls targeting outMeta, for clarity and consistency with the target variable. - Add a NULL check on `out` before memset in the SHE fallback, matching the guards already present in the cache and NVM paths. Add a direct server-side test that exercises the fallback by reading the master ECU key without provisioning it, verifying the returned metadata contains the correct len and id. Signed-off-by: Sameeh Jubran <sameeh@wolfssl.com>
bigbrett
approved these changes
Mar 2, 2026
Contributor
|
Thanks @sameehj ! |
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
3 participants
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.
In wh_Server_KeystoreReadKey, the SHE master ECU key fallback path (when the key is not found in cache or NVM) correctly zeroed outMeta but then wrote len and id to the local stack variable
metainstead of the caller's output parameteroutMeta. This left the caller with a zeroed metadata struct (len=0, id=0), contradicting the intended behavior of returning WH_SHE_KEY_SZ and the correct keyId.Add a direct server-side test that exercises the fallback by reading the master ECU key without provisioning it, verifying the returned metadata contains the correct len and id.