diff options
| author | Randall Spangler <rspangler@chromium.org> | 2011-03-16 09:56:15 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2011-03-16 09:56:15 -0700 |
| commit | 4c6e6dac28edfdfc724074b929ec95c6e3104d91 (patch) | |
| tree | 2885e982ee9b1815af92b66bf347a75a0a4d8b0c | |
| parent | b6a29ad3395c84a1c5c35a6a54bedbb867d4d4cd (diff) | |
| download | vboot-4c6e6dac28edfdfc724074b929ec95c6e3104d91.tar.gz | |
Fix compiler errors on MSVC
Change-Id: I47fd6d0be5542e5f540a34410b3f694ae0f67fd9
R=gauravsh@chromium.org
BUG=none
TEST=make && make runtests
Review URL: http://codereview.chromium.org/6676039
| -rw-r--r-- | firmware/lib/rollback_index.c | 1 | ||||
| -rw-r--r-- | firmware/lib/tpm_bootmode.c | 9 | ||||
| -rw-r--r-- | firmware/lib/vboot_firmware.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index 1d532f88..954dfeaf 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -354,7 +354,6 @@ uint32_t RollbackFirmwareLock(void) { uint32_t RollbackKernelRecovery(int developer_mode) { uint32_t rvs, rve; RollbackSpaceFirmware rsf; - uint8_t out_digest[20]; /* For PCR extend output */ /* In recovery mode we ignore TPM malfunctions or corruptions, and * * leave the TPM complelely unlocked; we call neither diff --git a/firmware/lib/tpm_bootmode.c b/firmware/lib/tpm_bootmode.c index 77731355..13371c40 100644 --- a/firmware/lib/tpm_bootmode.c +++ b/firmware/lib/tpm_bootmode.c @@ -28,7 +28,8 @@ * 7 Normal-signed firmware | 1 * (anything else) | 0 */ -const uint8_t kBootStateSHA1Digests[][20] = { + +const char* kBootStateSHA1Digests[] = { /* SHA1("\x00\x00\x00") */ "\x29\xe2\xdc\xfb\xb1\x6f\x63\xbb\x02\x54\xdf\x75\x85\xa1\x5b\xb6" "\xfb\x5e\x92\x7d", @@ -78,11 +79,11 @@ const uint8_t kBootStateSHA1Digests[][20] = { "\xbf\x35\x31\x78", }; -#define MAX_BOOT_STATE_INDEX (sizeof(kBootStateSHA1Digests)/sizeof(char[20])) +#define MAX_BOOT_STATE_INDEX (sizeof(kBootStateSHA1Digests)/sizeof(char*)) /* Used for PCR extend when the passed-in boot state is invalid or * if there is an internal error. */ -const uint8_t kBootInvalidSHA1Digest[20] = { +const uint8_t kBootInvalidSHA1Digest[] = { "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" "\xff\xff\xff\xff" }; @@ -123,7 +124,7 @@ uint32_t SetTPMBootModeState(int developer_mode, int recovery_mode, fw_keyblock_flags); if (digest_index >= 0 && digest_index < MAX_BOOT_STATE_INDEX) - in_digest = kBootStateSHA1Digests[digest_index]; + in_digest = (const uint8_t*)kBootStateSHA1Digests[digest_index]; else in_digest = kBootInvalidSHA1Digest; /* Internal out of bounds error. */ result = TlclExtend(BOOT_MODE_PCR, in_digest, out_digest); diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c index 95db892c..6265acc7 100644 --- a/firmware/lib/vboot_firmware.c +++ b/firmware/lib/vboot_firmware.c @@ -54,7 +54,7 @@ int LoadFirmware(LoadFirmwareParams* params) { uint32_t status; uint32_t test_err = 0; int good_index = -1; - int boot_fw_keyblock_flags = 0; + uint64_t boot_fw_keyblock_flags = 0; int is_dev; int index; int i; @@ -292,7 +292,7 @@ int LoadFirmware(LoadFirmwareParams* params) { /* At this point, we have a good idea of how we are going to boot. Update the * TPM with this state information. */ - status = SetTPMBootModeState(is_dev, 0, boot_fw_keyblock_flags); + status = SetTPMBootModeState(is_dev, 0, (int)boot_fw_keyblock_flags); if (0 != status) { VBDEBUG(("Unable to update the TPM with boot mode information.\n")); if (status == TPM_E_MUST_REBOOT) |