Skip to content

Clean up key wrap internal functions and tests #214

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 2 commits into from
Oct 20, 2025
Merged

Clean up key wrap internal functions and tests #214

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
adb4534
Remove unnused code in key wrap test. Use client id in sample meta data
AlexLanzano Oct 17, 2025
604e3f3
Remove use of VLA in key unwrapping function
AlexLanzano Oct 17, 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
16 changes: 9 additions & 7 deletions src/wh_server_keystore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,12 @@ static int _AesGcmWrapKey(whServerContext* server, whKeyId serverKeyId,
uint8_t iv[WOLFHSM_KEYWRAP_AES_GCM_IV_SIZE];
uint8_t serverKey[AES_MAX_KEY_SIZE];
uint32_t serverKeySz = sizeof(serverKey);
uint8_t plainBlob[sizeof(*metadataIn) + WOLFHSM_CFG_KEYWRAP_MAX_KEY_SIZE];
uint32_t plainBlobSz = sizeof(*metadataIn) + keySz;
uint8_t* encBlob;

if (server == NULL || keyIn == NULL || metadataIn == NULL ||
wrappedKeyOut == NULL) {
wrappedKeyOut == NULL || plainBlobSz > sizeof(plainBlob)) {
return WH_ERROR_BADARGS;
}

Expand Down Expand Up @@ -613,15 +616,14 @@ static int _AesGcmWrapKey(whServerContext* server, whKeyId serverKeyId,
}

/* Combine key and metadata into one blob */
uint8_t plainBlob[sizeof(*metadataIn) + keySz];
memcpy(plainBlob, metadataIn, sizeof(*metadataIn));
memcpy(plainBlob + sizeof(*metadataIn), keyIn, keySz);

/* Place the encrypted blob after the IV and Auth Tag*/
uint8_t* encBlob = (uint8_t*)wrappedKeyOut + sizeof(iv) + sizeof(authTag);
/* Place the encrypted blob after the IV and Auth Tag */
encBlob = (uint8_t*)wrappedKeyOut + sizeof(iv) + sizeof(authTag);

/* Encrypt the blob */
ret = wc_AesGcmEncrypt(aes, encBlob, plainBlob, sizeof(plainBlob), iv,
ret = wc_AesGcmEncrypt(aes, encBlob, plainBlob, plainBlobSz, iv,
sizeof(iv), authTag, sizeof(authTag), NULL, 0);
if (ret != 0) {
wc_AesFree(aes);
Expand Down Expand Up @@ -650,10 +652,10 @@ static int _AesGcmUnwrapKey(whServerContext* server, uint16_t serverKeyId,
uint32_t serverKeySz = sizeof(serverKey);
uint8_t* encBlob = (uint8_t*)wrappedKeyIn + sizeof(iv) + sizeof(authTag);
uint16_t encBlobSz = wrappedKeySz - sizeof(iv) - sizeof(authTag);
uint8_t plainBlob[sizeof(*metadataOut) + keySz];
uint8_t plainBlob[sizeof(*metadataOut) + WOLFHSM_CFG_KEYWRAP_MAX_KEY_SIZE];

if (server == NULL || wrappedKeyIn == NULL || metadataOut == NULL ||
keyOut == NULL) {
keyOut == NULL || keySz > WOLFHSM_CFG_KEYWRAP_MAX_KEY_SIZE) {
return WH_ERROR_BADARGS;
}

Expand Down
16 changes: 1 addition & 15 deletions test/wh_test_keywrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,6 @@

#endif /* HAVE_AESGCM */

/* RSA Specific defines */
#ifndef NO_RSA

#define WH_TEST_RSA_KEY_OFFSET 0x2000
#define WH_TEST_RSA_KEYID 3
#define WH_TEST_RSA_MAX_DER_SIZE 2000

/* We need the extra 4 bytes at the start to store the actual wrapped key size
*/
#define WH_TEST_RSA_MAX_WRAPPED_KEYSIZE \
(sizeof(uint32_t) + WH_TEST_AES_IVSIZE + WH_TEST_AES_TAGSIZE + \
WH_TEST_RSA_MAX_DER_SIZE + sizeof(whNvmMetadata))
#endif /* !NO_RSA */

static int _InitServerKek(whClientContext* client)
{
/* IMPORTANT NOTE: Server KEK is typically intrinsic or set during
Expand Down Expand Up @@ -101,7 +87,7 @@ static int _AesGcm_KeyWrap(whClientContext* client, WC_RNG* rng)
uint8_t wrappedKey[WH_TEST_AES_WRAPPED_KEYSIZE];
whKeyId wrappedKeyId;
whNvmMetadata metadata = {
.id = WH_MAKE_KEYID(WH_KEYTYPE_CRYPTO, 0, WH_TEST_AESGCM_KEYID),
.id = WH_MAKE_KEYID(WH_KEYTYPE_CRYPTO, client->comm->client_id, WH_TEST_AESGCM_KEYID),
.label = "AES Key Label",
.len = WH_TEST_AES_KEYSIZE,
.flags = WH_NVM_FLAGS_NONE,
Expand Down