Skip to content

Zeroize request messages in wh_client_auth.c #432

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
JacobBarthelmeh merged 2 commits into from
Jul 2, 2026
Merged

Zeroize request messages in wh_client_auth.c #432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1620c20
Zeroize request messages in wh_client_auth.c
padelsbach Jun 29, 2026
766d2ba
Check result of wh_CommClient_GetDataPtr for null
padelsbach Jul 1, 2026
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
91 changes: 54 additions & 37 deletions src/wh_client_auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ int wh_Client_AuthLoginRequest(whClientContext* c, whAuthMethod method,
const char* username, const void* auth_data,
uint16_t auth_data_len)
{
uint8_t buffer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
whMessageAuth_LoginRequest* msg = (whMessageAuth_LoginRequest*)buffer;
uint8_t* msg_auth_data = buffer + sizeof(*msg);
whMessageAuth_LoginRequest* msg;
uint8_t* msg_auth_data;
size_t msg_size;
int rc;

Expand All @@ -89,6 +88,14 @@ int wh_Client_AuthLoginRequest(whClientContext* c, whAuthMethod method,
return WH_ERROR_BADARGS;
}

/* Build the request directly in the comm buffer to avoid a second copy
* of the credential material */
msg = (whMessageAuth_LoginRequest*)wh_CommClient_GetDataPtr(c->comm);
Comment thread
bigbrett marked this conversation as resolved.
if (msg == NULL) {
return WH_ERROR_BADARGS;
}
msg_auth_data = (uint8_t*)msg + sizeof(*msg);

strncpy(msg->username, username, sizeof(msg->username) - 1);
msg->username[sizeof(msg->username) - 1] = '\0';
msg->method = method;
Expand All @@ -99,10 +106,10 @@ int wh_Client_AuthLoginRequest(whClientContext* c, whAuthMethod method,

rc = wh_Client_SendRequest(c, WH_MESSAGE_GROUP_AUTH,
WH_MESSAGE_AUTH_ACTION_LOGIN, (uint16_t)msg_size,
buffer);
msg);

/* Zeroize sensitive credential data before returning */
wh_Utils_ForceZero(buffer, sizeof(buffer));
wh_Utils_ForceZero(msg, msg_size);

return rc;
}
Expand Down Expand Up @@ -256,9 +263,8 @@ int wh_Client_AuthUserAddRequest(whClientContext* c, const char* username,
whAuthMethod method, const void* credentials,
uint16_t credentials_len)
{
uint8_t buffer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
whMessageAuth_UserAddRequest* msg = (whMessageAuth_UserAddRequest*)buffer;
uint8_t* msg_credentials = buffer + sizeof(*msg);
whMessageAuth_UserAddRequest* msg;
uint8_t* msg_credentials;
size_t msg_size;
int rc = WH_ERROR_OK;

Expand All @@ -270,6 +276,26 @@ int wh_Client_AuthUserAddRequest(whClientContext* c, const char* username,
return WH_ERROR_BADARGS;
}

if (credentials_len > 0 && credentials == NULL) {
return WH_ERROR_BADARGS;
}
if (credentials_len > WH_MESSAGE_AUTH_USERADD_MAX_CREDENTIALS_LEN) {
return WH_ERROR_BUFFER_SIZE;
}

msg_size = sizeof(*msg) + credentials_len;
if (msg_size > WOLFHSM_CFG_COMM_DATA_LEN) {
return WH_ERROR_BUFFER_SIZE;
}

/* Build the request directly in the comm buffer to avoid a second copy
* of the credential material */
msg = (whMessageAuth_UserAddRequest*)wh_CommClient_GetDataPtr(c->comm);
if (msg == NULL) {
return WH_ERROR_BADARGS;
}
msg_credentials = (uint8_t*)msg + sizeof(*msg);

strncpy(msg->username, username, sizeof(msg->username) - 1);
msg->username[sizeof(msg->username) - 1] = '\0';

Expand All @@ -281,33 +307,16 @@ int wh_Client_AuthUserAddRequest(whClientContext* c, const char* username,
msg->method = method;
msg->credentials_len = credentials_len;
if (credentials_len > 0) {
if (credentials == NULL) {
rc = WH_ERROR_BADARGS;
}
else if (credentials_len >
WH_MESSAGE_AUTH_USERADD_MAX_CREDENTIALS_LEN) {
rc = WH_ERROR_BUFFER_SIZE;
}
else {
memcpy(msg_credentials, credentials, credentials_len);
}
memcpy(msg_credentials, credentials, credentials_len);
}

if (rc == WH_ERROR_OK) {
msg_size = sizeof(*msg) + credentials_len;
if (msg_size > WOLFHSM_CFG_COMM_DATA_LEN) {
rc = WH_ERROR_BUFFER_SIZE;
}
else {
rc = wh_Client_SendRequest(c, WH_MESSAGE_GROUP_AUTH,
WH_MESSAGE_AUTH_ACTION_USER_ADD,
(uint16_t)msg_size, buffer);
}
}
rc = wh_Client_SendRequest(c, WH_MESSAGE_GROUP_AUTH,
WH_MESSAGE_AUTH_ACTION_USER_ADD,
(uint16_t)msg_size, msg);
}

/* Zeroize sensitive credential data before returning */
wh_Utils_ForceZero(buffer, sizeof(buffer));
wh_Utils_ForceZero(msg, msg_size);

return rc;
}
Expand Down Expand Up @@ -613,11 +622,9 @@ int wh_Client_AuthUserSetCredentialsRequest(
const void* current_credentials, uint16_t current_credentials_len,
const void* new_credentials, uint16_t new_credentials_len)
{
uint8_t buffer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
whMessageAuth_UserSetCredentialsRequest* msg =
(whMessageAuth_UserSetCredentialsRequest*)buffer;
uint8_t* msg_current_creds = buffer + sizeof(*msg);
uint8_t* msg_new_creds = msg_current_creds + current_credentials_len;
whMessageAuth_UserSetCredentialsRequest* msg;
uint8_t* msg_current_creds;
uint8_t* msg_new_creds;
uint16_t total_size;
int rc;

Expand Down Expand Up @@ -645,6 +652,16 @@ int wh_Client_AuthUserSetCredentialsRequest(
return WH_ERROR_BUFFER_SIZE;
}

/* Build the request directly in the comm buffer to avoid a second copy
* of the credential material */
msg = (whMessageAuth_UserSetCredentialsRequest*)wh_CommClient_GetDataPtr(
c->comm);
if (msg == NULL) {
return WH_ERROR_BADARGS;
}
msg_current_creds = (uint8_t*)msg + sizeof(*msg);
msg_new_creds = msg_current_creds + current_credentials_len;

/* Build message header */
msg->user_id = user_id;
msg->method = method;
Expand All @@ -661,10 +678,10 @@ int wh_Client_AuthUserSetCredentialsRequest(

rc = wh_Client_SendRequest(c, WH_MESSAGE_GROUP_AUTH,
WH_MESSAGE_AUTH_ACTION_USER_SET_CREDENTIALS,
total_size, buffer);
total_size, msg);

/* Zeroize sensitive credential data before returning */
wh_Utils_ForceZero(buffer, sizeof(buffer));
wh_Utils_ForceZero(msg, total_size);

return rc;
}
Expand Down
Loading