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

Fix skoll review

pull/481/head
Aidan Garske 2026-04-15 12:19:59 -07:00
parent 608e738f00
commit 5c45cfb483
6 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/seal/seal.c
View File

@ -128,8 +128,6 @@ int TPM2_Seal_Example(void* userCtx, int argc, char *argv[])
}
wolfTPM2_GetKeyTemplate_KeySeal(&publicTemplate, TPM_ALG_SHA256);
/* Allow password based unsealing */
publicTemplate.objectAttributes |= TPMA_OBJECT_userWithAuth;
/* set session for authorization key */
auth.size = (int)sizeof(gKeyAuth)-1;

16
src/spdm/spdm_psk.c
View File

@ -356,19 +356,21 @@ int wolfSPDM_ConnectPsk(WOLFSPDM_CTX* ctx)
wolfSPDM_TranscriptReset(ctx);
/* Step 1: GET_VERSION */
SPDM_CONNECT_STEP(ctx, "PSK Step 1: GET_VERSION\n",
wolfSPDM_GetVersion(ctx));
wolfSPDM_DebugPrint(ctx, "PSK Step 1: GET_VERSION\n");
rc = wolfSPDM_GetVersion(ctx);
/* Steps 2-3: GET_CAPABILITIES + NEGOTIATE_ALGORITHMS
* Not mandatory for PSK mode per TCG PC Client PSK spec.
* NS350 supports direct GET_VERSION -> PSK_EXCHANGE. */
/* Step 2: PSK_EXCHANGE / PSK_EXCHANGE_RSP */
txSz = sizeof(txBuf);
rxSz = sizeof(rxBuf);
if (rc == WOLFSPDM_SUCCESS) {
txSz = sizeof(txBuf);
rxSz = sizeof(rxBuf);
wolfSPDM_DebugPrint(ctx, "PSK Step 4: PSK_EXCHANGE\n");
rc = wolfSPDM_BuildPskExchange(ctx, txBuf, &txSz);
wolfSPDM_DebugPrint(ctx, "PSK Step 4: PSK_EXCHANGE\n");
rc = wolfSPDM_BuildPskExchange(ctx, txBuf, &txSz);
}
if (rc == WOLFSPDM_SUCCESS) {
rc = wolfSPDM_TranscriptAdd(ctx, txBuf, txSz);
}
@ -417,6 +419,8 @@ int wolfSPDM_ConnectPsk(WOLFSPDM_CTX* ctx)
}
/* Always zero sensitive stack buffers */
wc_ForceZero(txBuf, sizeof(txBuf));
wc_ForceZero(rxBuf, sizeof(rxBuf));
wc_ForceZero(finBuf, sizeof(finBuf));
wc_ForceZero(encBuf, sizeof(encBuf));
wc_ForceZero(decBuf, sizeof(decBuf));

2
src/spdm/spdm_tcg.c
View File

@ -89,7 +89,7 @@ int wolfSPDM_TCG_VendorCmdSecured(WOLFSPDM_CTX* ctx, const char* vdCode,
byte spdmMsg[WOLFSPDM_VENDOR_BUF_SZ];
int spdmMsgSz;
byte decBuf[WOLFSPDM_VENDOR_BUF_SZ];
word32 decSz;
word32 decSz = 0;
int rc;
byte ver;

62
src/tpm2.c
View File

@ -233,11 +233,9 @@ static int TPM2_CommandProcess(TPM2_CTX* ctx, TPM2_Packet* packet,
}
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && !defined(NO_HMAC)
rc = TPM2_GetName(ctx, handleValue1, info->inHandleCnt, 0, &name1);
if (rc == TPM_RC_SUCCESS)
rc = TPM2_GetName(ctx, handleValue2, info->inHandleCnt, 1, &name2);
if (rc == TPM_RC_SUCCESS)
rc = TPM2_GetName(ctx, handleValue3, info->inHandleCnt, 2, &name3);
rc = TPM2_GetName(ctx, handleValue1, info->inHandleCnt, 0, &name1);
rc |= TPM2_GetName(ctx, handleValue2, info->inHandleCnt, 1, &name2);
rc |= TPM2_GetName(ctx, handleValue3, info->inHandleCnt, 2, &name3);
if (rc != TPM_RC_SUCCESS) {
#ifdef DEBUG_WOLFTPM
printf("Error getting names for cpHash!\n");
@ -277,17 +275,18 @@ static int TPM2_CommandProcess(TPM2_CTX* ctx, TPM2_Packet* packet,
/* Update the Auth Area total size in the command packet */
i = TPM2_Packet_PlaceU32(packet, authTotalSzPos);
#ifdef DEBUG_WOLFTPM
if ((int)authSz != i) {
/* actual auth size did not match estimated size from
* TPM2_Packet_AppendAuth */
#ifdef DEBUG_WOLFTPM
printf("Error: Calculated auth size %d did not match actual %d!\n",
authSz, i);
#endif
return BUFFER_E;
}
#endif
(void)cmdCode;
(void)i;
return rc;
}
@ -1957,8 +1956,9 @@ TPM_RC TPM2_Duplicate(Duplicate_In* in, Duplicate_Out* out)
TPM2_Packet_AppendBytes(&packet, in->encryptionKeyIn.buffer,
in->encryptionKeyIn.size);
TPM2_Packet_AppendSymmetric(&packet,
(TPMT_SYM_DEF*)&in->symmetricAlg);
TPM2_Packet_AppendU16(&packet, in->symmetricAlg.algorithm);
TPM2_Packet_AppendU16(&packet, in->symmetricAlg.keyBits.sym);
TPM2_Packet_AppendU16(&packet, in->symmetricAlg.mode.sym);
TPM2_Packet_Finalize(&packet, TPM_ST_SESSIONS, TPM_CC_Duplicate);
@ -2831,10 +2831,7 @@ TPM_RC TPM2_Certify(Certify_In* in, Certify_Out* out)
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_Finalize(&packet, TPM_ST_SESSIONS, TPM_CC_Certify);
@ -2887,10 +2884,7 @@ TPM_RC TPM2_CertifyCreation(CertifyCreation_In* in, CertifyCreation_Out* out)
TPM2_Packet_AppendBytes(&packet, in->creationHash.buffer,
in->creationHash.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_AppendU16(&packet, in->creationTicket.tag);
TPM2_Packet_AppendU32(&packet, in->creationTicket.hierarchy);
@ -2945,10 +2939,7 @@ TPM_RC TPM2_Quote(Quote_In* in, Quote_Out* out)
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_AppendPCR(&packet, &in->PCRselect);
@ -3002,10 +2993,7 @@ TPM_RC TPM2_GetSessionAuditDigest(GetSessionAuditDigest_In* in,
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_Finalize(&packet, TPM_ST_SESSIONS,
TPM_CC_GetSessionAuditDigest);
@ -3057,10 +3045,7 @@ TPM_RC TPM2_GetCommandAuditDigest(GetCommandAuditDigest_In* in,
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_Finalize(&packet, TPM_ST_SESSIONS,
TPM_CC_GetCommandAuditDigest);
@ -3111,10 +3096,7 @@ TPM_RC TPM2_GetTime(GetTime_In* in, GetTime_Out* out)
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_Finalize(&packet, TPM_ST_SESSIONS, TPM_CC_GetTime);
@ -3299,14 +3281,7 @@ TPM_RC TPM2_Sign(Sign_In* in, Sign_Out* out)
TPM2_Packet_AppendU16(&packet, in->digest.size);
TPM2_Packet_AppendBytes(&packet, in->digest.buffer, in->digest.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
if (in->inScheme.scheme == TPM_ALG_ECDAA) {
TPM2_Packet_AppendU16(&packet,
in->inScheme.details.ecdaa.count);
}
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_AppendU16(&packet, in->validation.tag);
TPM2_Packet_AppendU32(&packet, in->validation.hierarchy);
@ -5465,10 +5440,7 @@ TPM_RC TPM2_NV_Certify(NV_Certify_In* in, NV_Certify_Out* out)
TPM2_Packet_AppendBytes(&packet, in->qualifyingData.buffer,
in->qualifyingData.size);
TPM2_Packet_AppendU16(&packet, in->inScheme.scheme);
if (in->inScheme.scheme != TPM_ALG_NULL) {
TPM2_Packet_AppendU16(&packet, in->inScheme.details.any.hashAlg);
}
TPM2_Packet_AppendEccScheme(&packet, &in->inScheme);
TPM2_Packet_AppendU16(&packet, in->size);
TPM2_Packet_AppendU16(&packet, in->offset);

14
src/tpm2_wrap.c
View File

@ -3786,8 +3786,13 @@ int wolfTPM2_DecodeRsaDer(const byte* der, word32 derSz,
pub->publicArea.objectAttributes = attributes;
rsa->keyBits = nSz * 8;
rsa->exponent = e;
/* if both sign and decrypt are set then must use NULL scheme */
rsa->scheme.scheme =
(attributes & TPMA_OBJECT_sign) ? TPM_ALG_RSASSA : TPM_ALG_NULL;
((attributes & TPMA_OBJECT_sign) &&
(attributes & TPMA_OBJECT_decrypt)) ?
TPM_ALG_NULL :
((attributes & TPMA_OBJECT_sign) ? TPM_ALG_RSASSA :
TPM_ALG_NULL);
rsa->scheme.details.anySig.hashAlg = WOLFTPM2_WRAP_DIGEST;
pub->publicArea.unique.rsa.size = nSz;
XMEMCPY(pub->publicArea.unique.rsa.buffer, n, nSz);
@ -3898,8 +3903,13 @@ int wolfTPM2_DecodeEccDer(const byte* der, word32 derSz, TPM2B_PUBLIC* pub,
pub->publicArea.nameAlg = WOLFTPM2_WRAP_DIGEST;
pub->publicArea.objectAttributes = attributes;
ecc->symmetric.algorithm = TPM_ALG_NULL;
/* if both sign and decrypt are set then must use NULL scheme */
ecc->scheme.scheme =
(attributes & TPMA_OBJECT_sign) ? TPM_ALG_ECDSA : TPM_ALG_NULL;
((attributes & TPMA_OBJECT_sign) &&
(attributes & TPMA_OBJECT_decrypt)) ?
TPM_ALG_NULL :
((attributes & TPMA_OBJECT_sign) ? TPM_ALG_ECDSA :
TPM_ALG_NULL);
ecc->scheme.details.ecdsa.hashAlg = WOLFTPM2_WRAP_DIGEST;
ecc->curveID = curveId;
ecc->kdf.scheme = TPM_ALG_NULL;

11
tests/unit_tests.c
View File

@ -1830,7 +1830,9 @@ static void test_KeySealTemplate(void)
printf("Test TPM Wrapper:\tKeySealTemplate:\t\tPassed\n");
}
/* Test boundary validation for seal size and keyed hash key size */
/* Test boundary validation for seal size and keyed hash key size.
* Uses zero-initialized dev intentionally — only testing argument validation,
* not TPM operations. */
static void test_SealAndKeyedHash_Boundaries(void)
{
int rc;
@ -2558,7 +2560,14 @@ static void test_wolfTPM2_DecodeDer_DefaultAttribs(void)
/* userWithAuth should be set */
AssertTrue(attrs & TPMA_OBJECT_userWithAuth);
/* When both sign and decrypt are set, scheme must be NULL */
AssertIntEQ(pub.publicArea.parameters.eccDetail.scheme.scheme,
TPM_ALG_NULL);
#endif
/* Note: DecodeRsaDer uses the same default attribute and scheme logic
* as DecodeEccDer — validated by the ECC test above. RSA DER key is
* too large (1217 bytes) to embed inline for a unit test. */
printf("Test TPM Wrapper:\tDecodeDer DefaultAttribs:\tPassed\n");
}