WolfSSL
/
wolfTPM
mirror of https://github.com/wolfSSL/wolfTPM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

F-2967 - https://fenrir.wolfssl.com/finding/2967 - Clear ECC private key from stack on error paths in wolfTPM2_ImportEccPrivateKeySeed

pull/488/head
Aidan 2026-04-17 14:02:13 -07:00
parent 47aca58edf
commit b05c503d71
2 changed files with 62 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/tpm2_wrap.c
View File

@ -3611,25 +3611,30 @@ int wolfTPM2_ImportEccPrivateKeySeed(WOLFTPM2_DEV* dev, const WOLFTPM2_KEY* pare
#ifdef DEBUG_WOLFTPM
printf("Import ECC name alg size invalid! %d\n", digestSz);
#endif
return BUFFER_E;
rc = BUFFER_E;
}
if (seed != NULL) {
/* use custom seed */
if (seedSz != digestSz) {
#ifdef DEBUG_WOLFTPM
printf("Import ECC seed size invalid! %d != %d\n",
seedSz, digestSz);
#endif
return BAD_FUNC_ARG;
if (rc == 0) {
if (seed != NULL) {
/* use custom seed */
if (seedSz != digestSz) {
#ifdef DEBUG_WOLFTPM
printf("Import ECC seed size invalid! %d != %d\n",
seedSz, digestSz);
#endif
rc = BAD_FUNC_ARG;
}
else {
sens.sensitiveArea.seedValue.size = seedSz;
XMEMCPY(sens.sensitiveArea.seedValue.buffer, seed, seedSz);
}
}
else {
/* assign random seed */
sens.sensitiveArea.seedValue.size = digestSz;
rc = TPM2_GetNonceNoLock(sens.sensitiveArea.seedValue.buffer,
sens.sensitiveArea.seedValue.size);
}
sens.sensitiveArea.seedValue.size = seedSz;
XMEMCPY(sens.sensitiveArea.seedValue.buffer, seed, seedSz);
}
else {
/* assign random seed */
sens.sensitiveArea.seedValue.size = digestSz;
rc = TPM2_GetNonceNoLock(sens.sensitiveArea.seedValue.buffer,
sens.sensitiveArea.seedValue.size);
}
if (rc == 0) {

40
tests/unit_tests.c
View File

@ -2741,6 +2741,43 @@ static void test_wolfTPM2_EncryptDecryptBlock(void)
printf("Test TPM Wrapper:\tEncryptDecryptBlock IV validate:\tPassed\n");
}
#ifdef HAVE_ECC
static void test_wolfTPM2_ImportEccPrivateKeySeed_ErrorPaths(void)
{
int rc;
WOLFTPM2_DEV dev;
WOLFTPM2_KEY parentKey;
WOLFTPM2_KEYBLOB keyBlob;
byte eccPubX[32];
byte eccPubY[32];
byte eccPriv[32];
/* Wrong-size seed to trigger seed size mismatch error path.
* WOLFTPM2_WRAP_DIGEST is SHA256 (digestSz=32), so seedSz=1 mismatches. */
byte seed[1] = {0x42};
TPMA_OBJECT attrs = (TPMA_OBJECT_sign | TPMA_OBJECT_userWithAuth |
TPMA_OBJECT_noDA);
XMEMSET(eccPubX, 0x01, sizeof(eccPubX));
XMEMSET(eccPubY, 0x02, sizeof(eccPubY));
XMEMSET(eccPriv, 0x03, sizeof(eccPriv));
rc = wolfTPM2_Init(&dev, TPM2_IoCb, NULL);
AssertIntEQ(rc, 0);
XMEMSET(&parentKey, 0, sizeof(parentKey));
XMEMSET(&keyBlob, 0, sizeof(keyBlob));
/* Seed size mismatch must return BAD_FUNC_ARG (and zero sens) */
rc = wolfTPM2_ImportEccPrivateKeySeed(&dev, &parentKey, &keyBlob,
TPM_ECC_NIST_P256, eccPubX, sizeof(eccPubX), eccPubY, sizeof(eccPubY),
eccPriv, sizeof(eccPriv), attrs, seed, sizeof(seed));
AssertIntEQ(rc, BAD_FUNC_ARG);
wolfTPM2_Cleanup(&dev);
printf("Test TPM Wrapper:\tImportEccSeed error paths:\tPassed\n");
}
#endif /* HAVE_ECC */
#endif /* !WOLFTPM2_NO_WRAPPER */
#ifndef NO_MAIN_DRIVER
@ -2804,6 +2841,9 @@ int unit_tests(int argc, char *argv[])
#endif
test_wolfTPM2_LoadPrivateKey_NullParent();
test_wolfTPM2_EncryptDecryptBlock();
#ifdef HAVE_ECC
test_wolfTPM2_ImportEccPrivateKeySeed_ErrorPaths();
#endif
test_wolfTPM2_KeyBlob(TPM_ALG_RSA);
test_wolfTPM2_KeyBlob(TPM_ALG_ECC);
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_ECC) && \