Skip to content

Fix a few compile errors due to config #105

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 3 commits into from
Apr 27, 2025
Merged

Fix a few compile errors due to config #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81d36d2
Fix a few compile errors due to config
billphipps Apr 26, 2025
af3138b
Limit keyexport output on error.
billphipps Apr 26, 2025
0d8cc01
Fix resp len
billphipps Apr 26, 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
10 changes: 4 additions & 6 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,7 @@ static int _getCryptoResponse(uint8_t* respBuf, uint16_t type,
/* Helper function to prepare a crypto request buffer with generic header */
static uint8_t* _createCryptoRequest(uint8_t* reqBuf, uint16_t type)
{
whMessageCrypto_GenericRequestHeader* header =
(whMessageCrypto_GenericRequestHeader*)reqBuf;
header->algoType = type;
header->algoSubType = WH_MESSAGE_CRYPTO_ALGO_SUBTYPE_NONE;
return reqBuf + sizeof(whMessageCrypto_GenericRequestHeader);
return _createCryptoRequestWithSubtype(reqBuf, type, WH_MESSAGE_CRYPTO_ALGO_SUBTYPE_NONE);
}

/* Helper function to prepare a crypto request buffer with generic header and
Expand Down Expand Up @@ -2549,9 +2545,11 @@ int wh_Client_Sha256(whClientContext* ctx, wc_Sha256* sha256, const uint8_t* in,

/* reset the state of the sha context (without blowing away devId) */
sha256->buffLen = 0;
sha256->flags = 0;
sha256->hiLen = 0;
sha256->loLen = 0;
#ifdef WOLFSSL_HASH_FLAGS
sha256->flags = 0;
#endif
memset(sha256->digest, 0, sizeof(sha256->digest));
}

Expand Down
9 changes: 7 additions & 2 deletions src/wh_server_keystore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,14 +707,19 @@ int wh_Server_HandleKeyRequest(whServerContext* server, uint16_t magic,
ret = WH_ERROR_OK;

if (ret == WH_ERROR_OK) {
resp.len = keySz;
/* Only provide key output if no error */
if (resp.rc == WH_ERROR_OK) {
resp.len = keySz;
} else {
resp.len = 0;
}
memcpy(resp.label, meta->label, sizeof(meta->label));

(void)wh_MessageKeystore_TranslateExportResponse(
magic, &resp,
(whMessageKeystore_ExportResponse*)resp_packet);

*out_resp_size = sizeof(resp) + keySz;
*out_resp_size = sizeof(resp) + resp.len;
}
} break;

Expand Down