Skip to content

Reject unsupported LoadExternal private types and fix creation ticket HMAC order #573

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
dgarske merged 2 commits into from
Aug 14, 2026
+24 −11
Merged

Reject unsupported LoadExternal private types and fix creation ticket HMAC order #573

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
1b3e0ee
F-9195 - Reject LoadExternal private area of an unsupported type
aidangarske Aug 12, 2026
6694dff
F-9204 - Order creation ticket HMAC as name then creationHash
aidangarske Aug 12, 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
19 changes: 13 additions & 6 deletions src/fwtpm/fwtpm_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5429,6 +5429,13 @@ static TPM_RC FwCmd_LoadExternal(FWTPM_CTX* ctx, TPM2_Packet* cmd,
}
#endif /* !NO_RSA */

/* A supplied private area whose sensitiveType matched no branch above (for
* example PQC types not yet supported by LoadExternal) must be rejected,
* not silently discarded, mirroring FwImportReconstructKey. */
if (rc == 0 && inPrivSize > 0 && privKeyDerSz == 0) {
rc = TPM_RC_TYPE;
}

/* Allocate transient object */
if (rc == 0) {
obj = FwAllocObject(ctx, &objHandle);
Expand Down Expand Up @@ -13122,12 +13129,12 @@ static TPM_RC FwCmd_CertifyCreation(FWTPM_CTX* ctx, TPM2_Packet* cmd,
FwComputeObjectName(objToSign);
}

/* ticketData = creationHash || objectName */
XMEMCPY(ticketData, creationHash.buffer, creationHash.size);
ticketDataSz = creationHash.size;
XMEMCPY(ticketData + ticketDataSz, objToSign->name.name,
objToSign->name.size);
ticketDataSz += objToSign->name.size;
/* ticketData = objectName || creationHash per Part 2 Sec.10.6.3 */
XMEMCPY(ticketData, objToSign->name.name, objToSign->name.size);
ticketDataSz = objToSign->name.size;
XMEMCPY(ticketData + ticketDataSz, creationHash.buffer,
creationHash.size);
ticketDataSz += creationHash.size;

int hmacRc;
UINT16 sizeMismatch;
Expand Down
16 changes: 11 additions & 5 deletions src/fwtpm/fwtpm_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,15 +387,21 @@ int FwAppendCreationHashAndTicket(FWTPM_CTX* ctx, TPM2_Packet* rsp,
TPM2_Packet_AppendU16(rsp, (UINT16)chSz);
if (chSz > 0) {
TPM2_Packet_AppendBytes(rsp, creationHash, chSz);
XMEMCPY(ticketData, creationHash, chSz);
ticketDataSz = chSz;
}
/* ticketData = objectName || creationHash per TPM 2.0 Part 2 Sec.10.6.3 */
if (objNameSz > 0) {
if (ticketDataSz + objNameSz > (int)sizeof(ticketData)) {
if (objNameSz > (int)sizeof(ticketData)) {
return TPM_RC_SIZE;
}
XMEMCPY(ticketData + ticketDataSz, objName, objNameSz);
ticketDataSz += objNameSz;
XMEMCPY(ticketData, objName, objNameSz);
ticketDataSz = objNameSz;
}
if (chSz > 0) {
if (ticketDataSz + chSz > (int)sizeof(ticketData)) {
return TPM_RC_SIZE;
}
XMEMCPY(ticketData + ticketDataSz, creationHash, chSz);
ticketDataSz += chSz;
}
return FwAppendTicket(ctx, rsp, TPM_ST_CREATION, hierarchy,
nameAlg, ticketData, ticketDataSz, NULL, 0);
Expand Down
Loading