scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change PCR extend call to capture the state of both recovery and dev modes

Browse Source 
Change-Id: I3f18081bda888a0fa6f56a67d0cef17268014706

BUG=chromium-os:6714
TEST=manual by enabling ROLLBACK_TPM in firmware/Makefile (did not test by compiling under MSVC)

Review URL: http://codereview.chromium.org/3973001
This commit is contained in:
Gaurav Shah
2010-10-21 14:40:38 -07:00
parent 00b9088fb2
commit 82602d7909
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
firmware/lib/rollback_index.c
View File

@@ -13,14 +13,23 @@
#include "utility.h" #include "utility.h"
/* TPM PCR to use for storing dev mode measurements */ /* TPM PCR to use for storing dev mode measurements */
#define DEV_MODE_PCR 0 #define DEV_REC_MODE_PCR 0
/* Input digests for PCR extend */ /* Input digests for PCR extend */
#define DEV_MODE_ON_SHA1_DIGEST ((uint8_t*) "\xbf\x8b\x45\x30\xd8\xd2\x46\xdd" \ #define DEV_OFF_REC_OFF_SHA1_DIGEST ((uint8_t*) "\x14\x89\xf9\x23\xc4\xdc\xa7" \
"\x74\xac\x53\xa1\x34\x71\xbb\xa1\x79\x41" \ "\x29\x17\x8b\x3e\x32\x33\x45\x85\x50" \
"\xdf\xf7") /* SHA1("\x01") */ "\xd8\xdd\xdf\x29") /* SHA1("\x00\x00") */
#define DEV_MODE_OFF_SHA1_DIGEST ((uint8_t*) "\x5b\xa9\x3c\x9d\xb0\xcf\xf9\x3f"\
"\x52\xb5\x21\xd7\x42\x0e\x43\xf6\xed\xa2" \ #define DEV_OFF_REC_ON_SHA1_DIGEST ((uint8_t*) "\x3f\x29\x54\x64\x53\x67\x8b" \
"\x78\x4f") /* SHA1("\x00") */ "\x85\x59\x31\xc1\x74\xa9\x7d\x6c\x08" \
"\x94\xb8\xf5\x46") /* SHA1("\x00\x01") */
#define DEV_ON_REC_OFF_SHA1_DIGEST ((uint8_t*) "\x0e\x35\x6b\xa5\x05\x63\x1f" \
"\xbf\x71\x57\x58\xbe\xd2\x7d\x50\x3f" \
"\x8b\x26\x0e\x3a") /* SHA1("\x01\x00") */
#define DEV_ON_REC_ON_SHA1_DIGEST ((uint8_t*) "\x91\x59\xcb\x8b\xce\xe7\xfc" \
"\xb9\x55\x82\xf1\x40\x96\x0c\xda\xe7" \
"\x27\x88\xd3\x26") /* SHA1("\x01\x01") */
static int g_rollback_recovery_mode = 0; static int g_rollback_recovery_mode = 0;
@@ -353,10 +362,10 @@ uint32_t RollbackFirmwareSetup(int developer_mode, uint32_t* version) {
*version = rsf.fw_versions; *version = rsf.fw_versions;
VBDEBUG(("TPM: RollbackFirmwareSetup %x\n", (int)rsf.fw_versions)); VBDEBUG(("TPM: RollbackFirmwareSetup %x\n", (int)rsf.fw_versions));
if (developer_mode) if (developer_mode)
RETURN_ON_FAILURE(TlclExtend(DEV_MODE_PCR, DEV_MODE_ON_SHA1_DIGEST, RETURN_ON_FAILURE(TlclExtend(DEV_REC_MODE_PCR, DEV_ON_REC_OFF_SHA1_DIGEST,
out_digest)); out_digest));
else else
RETURN_ON_FAILURE(TlclExtend(DEV_MODE_PCR, DEV_MODE_OFF_SHA1_DIGEST, RETURN_ON_FAILURE(TlclExtend(DEV_REC_MODE_PCR, DEV_OFF_REC_OFF_SHA1_DIGEST,
out_digest)); out_digest));
VBDEBUG(("TPM: RollbackFirmwareSetup dev mode PCR out_digest %02x %02x %02x " VBDEBUG(("TPM: RollbackFirmwareSetup dev mode PCR out_digest %02x %02x %02x "
"%02x\n", out_digest, out_digest+1, out_digest+2, out_digest+3)); "%02x\n", out_digest, out_digest+1, out_digest+2, out_digest+3));
@@ -379,14 +388,23 @@ uint32_t RollbackFirmwareLock(void) {
} }
uint32_t RollbackKernelRecovery(int developer_mode) { uint32_t RollbackKernelRecovery(int developer_mode) {
uint32_t rvs, rve;
RollbackSpaceFirmware rsf; RollbackSpaceFirmware rsf;
uint8_t out_digest[20]; /* For PCR extend output */
/* In recovery mode we ignore TPM malfunctions or corruptions, and * /* In recovery mode we ignore TPM malfunctions or corruptions, and *
* leave the TPM complelely unlocked; we call neither * leave the TPM complelely unlocked; we call neither
* TlclSetGlobalLock() nor TlclLockPhysicalPresence(). The recovery * TlclSetGlobalLock() nor TlclLockPhysicalPresence(). The recovery
* kernel will fix the TPM (if needed) and lock it ASAP. We leave * kernel will fix the TPM (if needed) and lock it ASAP. We leave
* Physical Presence on in either case. */ * Physical Presence on in either case. */
return SetupTPM(1, developer_mode, &rsf); rvs = SetupTPM(1, developer_mode, &rsf);
if (developer_mode)
rve = TlclExtend(DEV_REC_MODE_PCR, DEV_ON_REC_ON_SHA1_DIGEST, out_digest);
else
rve = TlclExtend(DEV_REC_MODE_PCR, DEV_OFF_REC_ON_SHA1_DIGEST, out_digest);
VBDEBUG(("TPM: RollbackKernelRecovery dev mode PCR out_digest %02x %02x %02x "
"%02x\n", out_digest, out_digest+1, out_digest+2, out_digest+3));
return (TPM_SUCCESS == rvs) ? rve : rvs;
} }
uint32_t RollbackKernelRead(uint32_t* version) { uint32_t RollbackKernelRead(uint32_t* version) {

2
firmware/version.c
View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=faf463e2"; char* VbootVersion = "VBOOv=08ac6493";