Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21748/src/trspi
Modified Files:
Tag: TROUSERS_0_2
trousers.c
Log Message:
made offsets in blob functions UINT64
Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** trousers.c 31 Aug 2006 18:49:45 -0000 1.24
--- trousers.c 8 Dec 2006 16:42:16 -0000 1.24.2.1
***************
*** 32,36 ****
void
! Trspi_UnloadBlob_DIGEST(UINT16 * offset, BYTE * blob, TCPA_DIGEST digest)
{
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
--- 32,36 ----
void
! Trspi_UnloadBlob_DIGEST(UINT64 * offset, BYTE * blob, TCPA_DIGEST digest)
{
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
***************
*** 38,42 ****
void
! Trspi_LoadBlob_PUBKEY(UINT16 *offset, BYTE *blob, TCPA_PUBKEY *pubKey)
{
Trspi_LoadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms);
--- 38,42 ----
void
! Trspi_LoadBlob_PUBKEY(UINT64 *offset, BYTE *blob, TCPA_PUBKEY *pubKey)
{
Trspi_LoadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms);
***************
*** 45,49 ****
TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
{
TSS_RESULT result;
--- 45,49 ----
TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
{
TSS_RESULT result;
***************
*** 65,69 ****
TSS_RESULT
! Trspi_UnloadBlob_MigrationKeyAuth(UINT16 *offset,
BYTE *blob,
TCPA_MIGRATIONKEYAUTH *migAuth)
--- 65,69 ----
TSS_RESULT
! Trspi_UnloadBlob_MigrationKeyAuth(UINT64 *offset,
BYTE *blob,
TCPA_MIGRATIONKEYAUTH *migAuth)
***************
*** 82,86 ****
#if 0
void
! LoadBlob_STORE_PRIVKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PRIVKEY * store)
{
LoadBlob_UINT32(offset, store->keyLength, blob);
--- 82,86 ----
#if 0
void
! LoadBlob_STORE_PRIVKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PRIVKEY * store)
{
LoadBlob_UINT32(offset, store->keyLength, blob);
***************
*** 89,95 ****
void
! LoadBlob_STORE_ASYMKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_ASYMKEY * store)
{
! blob[(*offset)++] = store->payload;
LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->usageAuth.secret);
LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->migrationAuth.secret);
--- 89,95 ----
void
! LoadBlob_STORE_ASYMKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_ASYMKEY * store)
{
! LoadBlob_BYTE(offset, store->payload, blob);
LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->usageAuth.secret);
LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->migrationAuth.secret);
***************
*** 100,129 ****
void
! Trspi_LoadBlob(UINT16 * offset, UINT32 size, BYTE * container, BYTE * object)
{
if (size == 0)
return;
! memcpy(&container[(*offset)], object, size);
! (*offset) += (UINT16) size;
}
void
! Trspi_UnloadBlob(UINT16 * offset, UINT32 size, BYTE * container, BYTE * object)
{
if (size == 0)
return;
memcpy(object, &container[(*offset)], size);
! (*offset) += (UINT16) size;
}
void
! Trspi_LoadBlob_BYTE(UINT16 * offset, BYTE data, BYTE * blob)
{
! blob[*offset] = data;
(*offset)++;
}
void
! Trspi_UnloadBlob_BYTE(UINT16 * offset, BYTE * dataOut, BYTE * blob)
{
*dataOut = blob[*offset];
--- 100,131 ----
void
! Trspi_LoadBlob(UINT64 * offset, UINT32 size, BYTE * container, BYTE * object)
{
if (size == 0)
return;
! if (container)
! memcpy(&container[(*offset)], object, size);
! (*offset) += (UINT64) size;
}
void
! Trspi_UnloadBlob(UINT64 * offset, UINT32 size, BYTE * container, BYTE * object)
{
if (size == 0)
return;
memcpy(object, &container[(*offset)], size);
! (*offset) += (UINT64) size;
}
void
! Trspi_LoadBlob_BYTE(UINT64 * offset, BYTE data, BYTE * blob)
{
! if (blob)
! blob[*offset] = data;
(*offset)++;
}
void
! Trspi_UnloadBlob_BYTE(UINT64 * offset, BYTE * dataOut, BYTE * blob)
{
*dataOut = blob[*offset];
***************
*** 132,143 ****
void
! Trspi_LoadBlob_BOOL(UINT16 * offset, TSS_BOOL data, BYTE * blob)
{
! blob[*offset] = (BYTE) data;
(*offset)++;
}
void
! Trspi_UnloadBlob_BOOL(UINT16 * offset, TSS_BOOL * dataOut, BYTE * blob)
{
*dataOut = blob[*offset];
--- 134,146 ----
void
! Trspi_LoadBlob_BOOL(UINT64 * offset, TSS_BOOL data, BYTE * blob)
{
! if (blob)
! blob[*offset] = (BYTE) data;
(*offset)++;
}
void
! Trspi_UnloadBlob_BOOL(UINT64 * offset, TSS_BOOL * dataOut, BYTE * blob)
{
*dataOut = blob[*offset];
***************
*** 146,164 ****
void
! Trspi_LoadBlob_UINT32(UINT16 * offset, UINT32 in, BYTE * blob)
{
! UINT32ToArray(in, &blob[*offset]);
*offset += 4;
}
void
! Trspi_LoadBlob_UINT16(UINT16 * offset, UINT16 in, BYTE * blob)
{
! UINT16ToArray(in, &blob[*offset]);
*offset += sizeof(UINT16);
}
void
! Trspi_UnloadBlob_UINT32(UINT16 * offset, UINT32 * out, BYTE * blob)
{
*out = Decode_UINT32(&blob[*offset]);
--- 149,169 ----
void
! Trspi_LoadBlob_UINT32(UINT64 * offset, UINT32 in, BYTE * blob)
{
! if (blob)
! UINT32ToArray(in, &blob[*offset]);
*offset += 4;
}
void
! Trspi_LoadBlob_UINT16(UINT64 * offset, UINT16 in, BYTE * blob)
{
! if (blob)
! UINT16ToArray(in, &blob[*offset]);
*offset += sizeof(UINT16);
}
void
! Trspi_UnloadBlob_UINT32(UINT64 * offset, UINT32 * out, BYTE * blob)
{
*out = Decode_UINT32(&blob[*offset]);
***************
*** 167,171 ****
void
! Trspi_UnloadBlob_UINT16(UINT16 * offset, UINT16 * out, BYTE * blob)
{
*out = Decode_UINT16(&blob[*offset]);
--- 172,176 ----
void
! Trspi_UnloadBlob_UINT16(UINT64 * offset, UINT16 * out, BYTE * blob)
{
*out = Decode_UINT16(&blob[*offset]);
***************
*** 174,178 ****
void
! Trspi_LoadBlob_RSA_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_RSA_KEY_PARMS * parms)
{
Trspi_LoadBlob_UINT32(offset, parms->keyLength, blob);
--- 179,183 ----
void
! Trspi_LoadBlob_RSA_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_RSA_KEY_PARMS * parms)
{
Trspi_LoadBlob_UINT32(offset, parms->keyLength, blob);
***************
*** 185,225 ****
void
! Trspi_UnloadBlob_TSS_VERSION(UINT16 * offset, BYTE * blob, TSS_VERSION * out)
{
! out->bMajor = blob[(*offset)++];
! out->bMinor = blob[(*offset)++];
! out->bRevMajor = blob[(*offset)++];
! out->bRevMinor = blob[(*offset)++];
}
void
! Trspi_LoadBlob_TSS_VERSION(UINT16 * offset, BYTE * blob, TSS_VERSION version)
{
! blob[(*offset)++] = version.bMajor;
! blob[(*offset)++] = version.bMinor;
! blob[(*offset)++] = version.bRevMajor;
! blob[(*offset)++] = version.bRevMinor;
}
void
! Trspi_UnloadBlob_TCPA_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION * out)
{
! out->major = blob[(*offset)++];
! out->minor = blob[(*offset)++];
! out->revMajor = blob[(*offset)++];
! out->revMinor = blob[(*offset)++];
}
void
! Trspi_LoadBlob_TCPA_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION version)
{
! blob[(*offset)++] = version.major;
! blob[(*offset)++] = version.minor;
! blob[(*offset)++] = version.revMajor;
! blob[(*offset)++] = version.revMinor;
}
TSS_RESULT
! Trspi_UnloadBlob_PCR_INFO(UINT16 * offset, BYTE * blob, TCPA_PCR_INFO * pcr)
{
TSS_RESULT result;
--- 190,230 ----
void
! Trspi_UnloadBlob_TSS_VERSION(UINT64 * offset, BYTE * blob, TSS_VERSION * out)
{
! Trspi_UnloadBlob_BYTE(offset, &out->bMajor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->bMinor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->bRevMajor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->bRevMinor, blob);
}
void
! Trspi_LoadBlob_TSS_VERSION(UINT64 * offset, BYTE * blob, TSS_VERSION version)
{
! Trspi_LoadBlob_BYTE(offset, version.bMajor, blob);
! Trspi_LoadBlob_BYTE(offset, version.bMinor, blob);
! Trspi_LoadBlob_BYTE(offset, version.bRevMajor, blob);
! Trspi_LoadBlob_BYTE(offset, version.bRevMinor, blob);
}
void
! Trspi_UnloadBlob_TCPA_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION * out)
{
! Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->revMajor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->revMinor, blob);
}
void
! Trspi_LoadBlob_TCPA_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION version)
{
! Trspi_LoadBlob_BYTE(offset, version.major, blob);
! Trspi_LoadBlob_BYTE(offset, version.minor, blob);
! Trspi_LoadBlob_BYTE(offset, version.revMajor, blob);
! Trspi_LoadBlob_BYTE(offset, version.revMinor, blob);
}
TSS_RESULT
! Trspi_UnloadBlob_PCR_INFO(UINT64 * offset, BYTE * blob, TCPA_PCR_INFO * pcr)
{
TSS_RESULT result;
***************
*** 233,237 ****
TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(UINT16 * offset, BYTE * blob, TCPA_STORED_DATA * data)
{
Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
--- 238,242 ----
TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(UINT64 * offset, BYTE * blob, TCPA_STORED_DATA * data)
{
Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
***************
*** 269,273 ****
void
! Trspi_LoadBlob_STORED_DATA(UINT16 * offset, BYTE * blob, TCPA_STORED_DATA * data)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, data->ver);
--- 274,278 ----
void
! Trspi_LoadBlob_STORED_DATA(UINT64 * offset, BYTE * blob, TCPA_STORED_DATA * data)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, data->ver);
***************
*** 279,290 ****
TSS_RESULT
! Trspi_UnloadBlob_PCR_SELECTION(UINT16 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
{
UINT16 i;
! pcr->sizeOfSelect = Decode_UINT16(&blob[*offset]);
if (pcr->sizeOfSelect > 0) {
- *offset += sizeof(UINT16);
pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
if (pcr->pcrSelect == NULL) {
--- 284,294 ----
TSS_RESULT
! Trspi_UnloadBlob_PCR_SELECTION(UINT64 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
{
UINT16 i;
! Trspi_UnloadBlob_UINT16(offset, &pcr->sizeOfSelect, blob);
if (pcr->sizeOfSelect > 0) {
pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
if (pcr->pcrSelect == NULL) {
***************
*** 293,298 ****
}
! for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! pcr->pcrSelect[i] = blob[*offset];
} else {
pcr->pcrSelect = NULL;
--- 297,302 ----
}
! for (i = 0; i < pcr->sizeOfSelect; i++)
! Trspi_UnloadBlob_BYTE(offset, &pcr->pcrSelect[i], blob);
} else {
pcr->pcrSelect = NULL;
***************
*** 303,307 ****
TSS_RESULT
! Trspi_UnloadBlob_PCR_COMPOSITE(UINT16 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
{
TSS_RESULT result;
--- 307,311 ----
TSS_RESULT
! Trspi_UnloadBlob_PCR_COMPOSITE(UINT64 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
{
TSS_RESULT result;
***************
*** 322,342 ****
void
! Trspi_LoadBlob_PCR_SELECTION(UINT16 * offset, BYTE * blob, TCPA_PCR_SELECTION *pcr)
{
UINT16 i;
! UINT16ToArray(pcr->sizeOfSelect, &blob[*offset]);
! *offset += sizeof(UINT16);
! for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! blob[*offset] = pcr->pcrSelect[i];
}
void
! Trspi_LoadBlob_KEY(UINT16 * offset, BYTE * blob, TCPA_KEY * key)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! blob[(*offset)++] = key->authDataUsage;
Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
--- 326,345 ----
void
! Trspi_LoadBlob_PCR_SELECTION(UINT64 * offset, BYTE * blob, TCPA_PCR_SELECTION *pcr)
{
UINT16 i;
! Trspi_LoadBlob_UINT16(offset, pcr->sizeOfSelect, blob);
! for (i = 0; i < pcr->sizeOfSelect; i++)
! Trspi_LoadBlob_BYTE(offset, pcr->pcrSelect[i], blob);
}
void
! Trspi_LoadBlob_KEY(UINT64 * offset, BYTE * blob, TCPA_KEY * key)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
***************
*** 348,352 ****
void
! Trspi_LoadBlob_KEY_FLAGS(UINT16 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
{
UINT32 tempFlag = 0;
--- 351,355 ----
void
! Trspi_LoadBlob_KEY_FLAGS(UINT64 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
{
UINT32 tempFlag = 0;
***************
*** 362,366 ****
void
! Trspi_UnloadBlob_KEY_FLAGS(UINT16 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
{
UINT32 tempFlag = 0;
--- 365,369 ----
void
! Trspi_UnloadBlob_KEY_FLAGS(UINT64 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
{
UINT32 tempFlag = 0;
***************
*** 378,382 ****
void
! Trspi_LoadBlob_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyInfo)
{
Trspi_LoadBlob_UINT32(offset, keyInfo->algorithmID, blob);
--- 381,385 ----
void
! Trspi_LoadBlob_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_KEY_PARMS * keyInfo)
{
Trspi_LoadBlob_UINT32(offset, keyInfo->algorithmID, blob);
***************
*** 390,394 ****
void
! Trspi_LoadBlob_STORE_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
{
Trspi_LoadBlob_UINT32(offset, store->keyLength, blob);
--- 393,397 ----
void
! Trspi_LoadBlob_STORE_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
{
Trspi_LoadBlob_UINT32(offset, store->keyLength, blob);
***************
*** 397,401 ****
void
! Trspi_LoadBlob_UUID(UINT16 * offset, BYTE * blob, TSS_UUID uuid)
{
Trspi_LoadBlob_UINT32(offset, uuid.ulTimeLow, blob);
--- 400,404 ----
void
! Trspi_LoadBlob_UUID(UINT64 * offset, BYTE * blob, TSS_UUID uuid)
{
Trspi_LoadBlob_UINT32(offset, uuid.ulTimeLow, blob);
***************
*** 408,412 ****
void
! Trspi_UnloadBlob_UUID(UINT16 * offset, BYTE * blob, TSS_UUID * uuid)
{
memset(uuid, 0, sizeof(TSS_UUID));
--- 411,415 ----
void
! Trspi_UnloadBlob_UUID(UINT64 * offset, BYTE * blob, TSS_UUID * uuid)
{
memset(uuid, 0, sizeof(TSS_UUID));
***************
*** 420,424 ****
TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
{
Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
--- 423,427 ----
TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
{
Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
***************
*** 442,446 ****
TSS_RESULT
! Trspi_UnloadBlob_KEY(UINT16 * offset, BYTE * blob, TCPA_KEY * key)
{
TSS_RESULT result;
--- 445,449 ----
TSS_RESULT
! Trspi_UnloadBlob_KEY(UINT64 * offset, BYTE * blob, TCPA_KEY * key)
{
TSS_RESULT result;
***************
*** 449,453 ****
Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! key->authDataUsage = blob[(*offset)++];
if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
return result;
--- 452,456 ----
Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! Trspi_UnloadBlob_BYTE(offset, &key->authDataUsage, blob);
if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
return result;
***************
*** 484,500 ****
/*
! void UnloadBlob_VERSION( UINT16* offset, BYTE* blob, TCPA_VERSION* out ){
!
! out->major = blob[(*offset)++];
! out->minor = blob[(*offset)++];
! out->revMajor = blob[(*offset)++];
! out->revMinor = blob[(*offset)++];
!
! return;
}
*/
TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
{
Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
--- 487,502 ----
/*
! void
! UnloadBlob_VERSION( UINT16* offset, BYTE* blob, TCPA_VERSION* out )
! {
! Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->revMajor, blob);
! Trspi_UnloadBlob_BYTE(offset, &out->revMinor, blob);
}
*/
TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
{
Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
***************
*** 516,520 ****
#if 0
void
! LoadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY pubKey)
{
LoadBlob_KEY_PARMS(offset, blob, &pubKey.algorithmParms);
--- 518,522 ----
#if 0
void
! LoadBlob_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_PUBKEY pubKey)
{
LoadBlob_KEY_PARMS(offset, blob, &pubKey.algorithmParms);
***************
*** 524,528 ****
void
! LoadBlob_CERTIFY_INFO(UINT16 * offset, BYTE * blob, TCPA_CERTIFY_INFO * certify)
{
--- 526,530 ----
void
! LoadBlob_CERTIFY_INFO(UINT64 * offset, BYTE * blob, TCPA_CERTIFY_INFO * certify)
{
***************
*** 540,549 ****
void
! Trspi_UnloadBlob_TCPA_EVENT_CERT(UINT16 * offset, BYTE * blob, TCPA_EVENT_CERT * cert)
{
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->certificateHash.digest);
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->entityDigest.digest);
! cert->digestChecked = blob[(*offset)++];
! cert->digestVerified = blob[(*offset)++];
Trspi_UnloadBlob_UINT32(offset, &cert->issuerSize, blob);
Trspi_UnloadBlob(offset, cert->issuerSize, blob, cert->issuer);
--- 542,551 ----
void
! Trspi_UnloadBlob_TCPA_EVENT_CERT(UINT64 * offset, BYTE * blob, TCPA_EVENT_CERT * cert)
{
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->certificateHash.digest);
Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->entityDigest.digest);
! Trspi_UnloadBlob_BYTE(offset, &cert->digestChecked, blob);
! Trspi_UnloadBlob_BYTE(offset, &cert->digestVerified, blob);
Trspi_UnloadBlob_UINT32(offset, &cert->issuerSize, blob);
Trspi_UnloadBlob(offset, cert->issuerSize, blob, cert->issuer);
***************
*** 552,556 ****
void
! Trspi_UnloadBlob_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION * out)
{
Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
--- 554,558 ----
void
! Trspi_UnloadBlob_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION * out)
{
Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
***************
*** 561,565 ****
void
! Trspi_UnloadBlob_KM_KEYINFO(UINT16 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
{
Trspi_UnloadBlob_TSS_VERSION( offset, blob, &info->versionInfo);
--- 563,567 ----
void
! Trspi_UnloadBlob_KM_KEYINFO(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
{
Trspi_UnloadBlob_TSS_VERSION( offset, blob, &info->versionInfo);
***************
*** 573,577 ****
void
! Trspi_LoadBlob_PCR_EVENT(UINT16 *offset, BYTE *blob, TSS_PCR_EVENT *event)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, *(TCPA_VERSION *)(&event->versionInfo));
--- 575,579 ----
void
! Trspi_LoadBlob_PCR_EVENT(UINT64 *offset, BYTE *blob, TSS_PCR_EVENT *event)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, *(TCPA_VERSION *)(&event->versionInfo));
***************
*** 590,594 ****
TSS_RESULT
! Trspi_UnloadBlob_PCR_EVENT(UINT16 *offset, BYTE *blob, TSS_PCR_EVENT *event)
{
Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&(event->versionInfo));
--- 592,596 ----
TSS_RESULT
! Trspi_UnloadBlob_PCR_EVENT(UINT64 *offset, BYTE *blob, TSS_PCR_EVENT *event)
{
Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&(event->versionInfo));
***************
*** 629,638 ****
*/
void
! Trspi_LoadBlob_PRIVKEY_DIGEST(UINT16 * offset, BYTE * blob, TCPA_KEY *key)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! blob[(*offset)++] = key->authDataUsage;
Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
--- 631,640 ----
*/
void
! Trspi_LoadBlob_PRIVKEY_DIGEST(UINT64 * offset, BYTE * blob, TCPA_KEY *key)
{
Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
***************
*** 647,651 ****
void
! Trspi_LoadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
{
Trspi_LoadBlob_UINT32(offset, key->algId, blob);
--- 649,653 ----
void
! Trspi_LoadBlob_SYMMETRIC_KEY(UINT64 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
{
Trspi_LoadBlob_UINT32(offset, key->algId, blob);
***************
*** 658,662 ****
TSS_RESULT
! Trspi_UnloadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
{
Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
--- 660,664 ----
TSS_RESULT
! Trspi_UnloadBlob_SYMMETRIC_KEY(UINT64 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
{
Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
***************
*** 679,683 ****
TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_REQ(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
{
Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
--- 681,685 ----
TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_REQ(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
{
Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
***************
*** 716,720 ****
TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_PROOF(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_PROOF *proof)
{
TSS_RESULT result;
--- 718,722 ----
TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_PROOF(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_PROOF *proof)
{
TSS_RESULT result;
***************
*** 826,830 ****
void
! Trspi_LoadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
TCPA_SYM_CA_ATTESTATION *sym)
{
--- 828,832 ----
void
! Trspi_LoadBlob_SYM_CA_ATTESTATION(UINT64 *offset, BYTE *blob,
TCPA_SYM_CA_ATTESTATION *sym)
{
***************
*** 835,839 ****
TSS_RESULT
! Trspi_UnloadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
TCPA_SYM_CA_ATTESTATION *sym)
{
--- 837,841 ----
TSS_RESULT
! Trspi_UnloadBlob_SYM_CA_ATTESTATION(UINT64 *offset, BYTE *blob,
TCPA_SYM_CA_ATTESTATION *sym)
{
***************
*** 863,867 ****
void
! Trspi_LoadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
TCPA_ASYM_CA_CONTENTS *asym)
{
--- 865,869 ----
void
! Trspi_LoadBlob_ASYM_CA_CONTENTS(UINT64 *offset, BYTE *blob,
TCPA_ASYM_CA_CONTENTS *asym)
{
***************
*** 872,876 ****
TSS_RESULT
! Trspi_UnloadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
TCPA_ASYM_CA_CONTENTS *asym)
{
--- 874,878 ----
TSS_RESULT
! Trspi_UnloadBlob_ASYM_CA_CONTENTS(UINT64 *offset, BYTE *blob,
TCPA_ASYM_CA_CONTENTS *asym)
{
|