Skip to content

Use ConstantCompare instead of memcmp in wh_server_she.c #326

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
bigbrett merged 1 commit into from
Mar 25, 2026
Merged

Use ConstantCompare instead of memcmp in wh_server_she.c #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/wh_server_she.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "wolfssl/wolfcrypt/wc_port.h"
#include "wolfssl/wolfcrypt/aes.h"
#include "wolfssl/wolfcrypt/cmac.h"
#include "wolfssl/wolfcrypt/misc.h"
#include "wolfhsm/wh_server_keystore.h"
#endif /* !WOLFHSM_CFG_NO_CRYPTO */

Expand Down Expand Up @@ -385,7 +386,7 @@ static int _SecureBootFinish(whServerContext* server, uint16_t magic,
}
if (ret == 0) {
/* compare and set either success or failure */
ret = memcmp(cmacOutput, macDigest, field);
ret = ConstantCompare(cmacOutput, macDigest, field);
if (ret == 0) {
server->she->sbState = WH_SHE_SB_SUCCESS;
resp.status = WH_SHE_ERC_NO_ERROR;
Expand Down Expand Up @@ -503,7 +504,7 @@ static int _LoadKey(whServerContext* server, uint16_t magic, uint16_t req_size,
sizeof(cmacInput), tmpKey, WH_SHE_KEY_SZ, NULL, server->devId);
}
/* compare digest to M3 */
if (ret == 0 && memcmp(req.messageThree, cmacOutput, field) != 0) {
if (ret == 0 && ConstantCompare(req.messageThree, cmacOutput, field) != 0) {
ret = WH_SHE_ERC_KEY_UPDATE_ERROR;
}
/* make K1 using AES-MP(authKey | WH_SHE_KEY_UPDATE_ENC_C) */
Expand Down Expand Up @@ -556,7 +557,7 @@ static int _LoadKey(whServerContext* server, uint16_t magic, uint16_t req_size,
}
}
/* compare to UID */
else if (ret == 0 && memcmp(req.messageOne, server->she->uid,
else if (ret == 0 && ConstantCompare(req.messageOne, server->she->uid,
sizeof(server->she->uid)) != 0) {
ret = WH_SHE_ERC_KEY_UPDATE_ERROR;
}
Expand Down
Loading