diff options
| author | Chris Engel <cjengel@us.ibm.com> | 2016-06-06 10:48:58 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-08-01 13:58:06 -0400 |
| commit | a44d7064df1a51935e90b6ff22231ac7aa9e1ae4 (patch) | |
| tree | 2b70184f6ce049381cedb4d6046e444e000d3c06 /src/usr/secureboot/trusted/test | |
| parent | 2f54d71dbf7318cda9dbf6d72f42d24d2db9e50e (diff) | |
| download | talos-hostboot-a44d7064df1a51935e90b6ff22231ac7aa9e1ae4.tar.gz talos-hostboot-a44d7064df1a51935e90b6ff22231ac7aa9e1ae4.zip | |
SecureBoot: Update sha1 bank of PCRs along with sha256
Change-Id: I526809abe8fa8d00929f79a4c3e1dcaf7386873a
RTC: 154324
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27032
Reviewed-by: Timothy R. Block <block@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27634
Reviewed-by: Christopher J. Engel <cjengel@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot/trusted/test')
| -rwxr-xr-x | src/usr/secureboot/trusted/test/tpmLogMgrTest.H | 10 | ||||
| -rwxr-xr-x | src/usr/secureboot/trusted/test/trustedbootTest.H | 24 |
2 files changed, 28 insertions, 6 deletions
diff --git a/src/usr/secureboot/trusted/test/tpmLogMgrTest.H b/src/usr/secureboot/trusted/test/tpmLogMgrTest.H index f2f1d4d54..27ba7c2aa 100755 --- a/src/usr/secureboot/trusted/test/tpmLogMgrTest.H +++ b/src/usr/secureboot/trusted/test/tpmLogMgrTest.H @@ -60,8 +60,8 @@ class TPMLogMgrTest: public CxxTest::TestSuite delete err; err = NULL; } - else if (TpmLogMgr_getLogSize(logMgr) != 69) - // 69 is size of header entry + else if (TpmLogMgr_getLogSize(logMgr) != 73) + // 73 is size of header entry { TS_FAIL( "getTestLogMgr - Failed to find " "proper header log Len=%d", @@ -123,7 +123,7 @@ class TPMLogMgrTest: public CxxTest::TestSuite break; } - memset(log.digests.digests[0].digest.bytes, + memset(&(log.digests.digests[0].digest), 0x51+idx, digestSize); log.event.eventSize = 21+idx; @@ -213,7 +213,9 @@ class TPMLogMgrTest: public CxxTest::TestSuite // Get a TCG_PCR_EVENT2 TCG_PCR_EVENT2 eventLog = TpmLogMgr_genLogEventPcrExtend( pcr, algId, - digest, digestSize, i_logMsg); + digest, digestSize, + TPM_ALG_SHA1, digest, + digestSize, i_logMsg); // Add event to log errlHndl_t err = TpmLogMgr_addEvent(&i_logMgr, &eventLog); diff --git a/src/usr/secureboot/trusted/test/trustedbootTest.H b/src/usr/secureboot/trusted/test/trustedbootTest.H index e19ad1d00..e8b062ad7 100755 --- a/src/usr/secureboot/trusted/test/trustedbootTest.H +++ b/src/usr/secureboot/trusted/test/trustedbootTest.H @@ -448,7 +448,26 @@ class TrustedBootTest: public CxxTest::TestSuite fails, sizeof(TPM2_ExtendIn) + sizeof(TPMS_AUTH_COMMAND) + - 4); //auth size field + sizeof(uint32_t) - //auth size field + sizeof(TPMT_HA)); // less second digest + + cmdPtr->digests.count = 2; + cmdPtr->digests.digests[1].algorithmId = TPM_ALG_SHA1; + + // Test with two hashes + runTpmMarshalTest(baseCmd, + dataBufOut, + sizeof(dataBufOut), + cmdSize, + "ExtendIn", + num_ops, + fails, + sizeof(TPM2_ExtendIn) + + sizeof(TPMS_AUTH_COMMAND) + + sizeof(uint32_t) - //auth size field + (TPM_ALG_SHA256_SIZE - TPM_ALG_SHA1_SIZE) + ); // less sha1 digest size + // Invalid number of digests memset(dataBufIn, 0, sizeof(dataBufIn)); @@ -488,7 +507,8 @@ class TrustedBootTest: public CxxTest::TestSuite "PcrReadIn", num_ops, fails, - sizeof(TPM2_PcrReadIn)); + sizeof(TPM2_PcrReadIn) - + sizeof(TPMS_PCR_SELECTION)); // less unused // Invalid number of algorithms memset(dataBufIn, 0, sizeof(dataBufIn)); |
