Skip to content

fixes: wrong #endif placement in wh_client_crypto.c and #include order in nvm_flah_log.h #243

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.

Sign up for GitHub

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

Merged
billphipps merged 2 commits into from
Nov 18, 2025
Merged

fixes: wrong #endif placement in wh_client_crypto.c and #include order in nvm_flah_log.h #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b7544
nvm: flash_log: fix include order not picking up settings
rizlik Nov 18, 2025
6560cad
fix: wrong #endif placement
rizlik Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2823,6 +2823,7 @@ int wh_Client_AesGetKeyId(Aes* key, whNvmId* outId)
*outId = WH_DEVCTX_TO_KEYID(key->devCtx);
return WH_ERROR_OK;
}
#endif /* !NO_AES */

#ifdef WOLFSSL_CMAC
int wh_Client_CmacSetKeyId(Cmac* key, whNvmId keyId)
Expand Down Expand Up @@ -2868,7 +2869,6 @@ int wh_Client_Cmac(whClientContext* ctx, Cmac* cmac, CmacType type,
WH_DEBUG_CLIENT_VERBOSE("cmac key:%p key_len:%d in:%p in_len:%d out:%p out_len:%d "
"keyId:%x\n",
key, (int)keyLen, in, (int)inLen, outMac, (int)mac_len, key_id);
#endif


/* Get data pointer */
Expand Down
4 changes: 2 additions & 2 deletions wolfhsm/wh_nvm_flash_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
#ifndef WOLFHSM_WH_NVM_FLASH_LOG_H_
#define WOLFHSM_WH_NVM_FLASH_LOG_H_

#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)

#include "wolfhsm/wh_settings.h"

#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)

#include "wolfhsm/wh_common.h"
#include "wolfhsm/wh_flash.h"

Expand Down