diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2017-04-27 12:51:41 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-02 00:02:23 -0400 |
| commit | 146e0ee7f3ad8d31e2421a325acc07ed4516e6e8 (patch) | |
| tree | 46ff503a09591d5e62eb47a55e3acec36d6d1c32 /src/usr/util/test | |
| parent | b4eb096bd19d6b4aee4aa87424818bff1d5605eb (diff) | |
| download | blackbird-hostboot-146e0ee7f3ad8d31e2421a325acc07ed4516e6e8.tar.gz blackbird-hostboot-146e0ee7f3ad8d31e2421a325acc07ed4516e6e8.zip | |
Sign and Verify the OCC partition (port from P8)
Change-Id: Id7e8668f92a8a702f709d15647f2a288783730a0
RTC: 167671
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39774
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-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: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/util/test')
| -rw-r--r-- | src/usr/util/test/testlidmgr.H | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/usr/util/test/testlidmgr.H b/src/usr/util/test/testlidmgr.H index e9c3b4cf3..334c1d810 100644 --- a/src/usr/util/test/testlidmgr.H +++ b/src/usr/util/test/testlidmgr.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -177,6 +177,18 @@ public: break; } +#ifdef CONFIG_SECUREBOOT + // For secureboot sections, PNOR .secureProtectedPayloadSize + // is used rather than full PNOR size + if (l_lidSize != l_lidPnorInfo.secureProtectedPayloadSize) + { + TS_FAIL("testLidInPnorOcc: lidSize does not match pnor OCC" + " section size 0x%.8X != 0x%.8X", + l_lidSize, l_lidPnorInfo.secureProtectedPayloadSize); + break; + } + +#else if (l_lidSize != l_lidPnorInfo.size) { TS_FAIL("testLidInPnorOcc: lidSize does not match pnor OCC" @@ -184,9 +196,10 @@ public: l_lidSize, l_lidPnorInfo.size); break; } +#endif - char * l_ptrOcc = new char[l_lidPnorInfo.size]; - l_errl = l_lidMgr.getLid(l_ptrOcc, l_lidPnorInfo.size); + char * l_ptrOcc = new char[l_lidSize]; + l_errl = l_lidMgr.getLid(l_ptrOcc, l_lidSize); if(l_errl) { errlCommit(l_errl, UTIL_COMP_ID); @@ -204,11 +217,11 @@ public: TS_FAIL("testLidInPnorOcc: failed to store lid from PNOR"); } - if (l_lidImageSize != l_lidPnorInfo.size) + if (l_lidImageSize != l_lidSize) { TS_FAIL("testLidInPnorOcc: lidImageSize does not match pnor OCC" " section size 0x%.8X != 0x%.8X", - l_lidImageSize, l_lidPnorInfo.size); + l_lidImageSize, l_lidSize); } l_errl = l_lidMgr.releaseLidImage(); |
