Even more integration fixes.
Review URL: http://codereview.chromium.org/2849021
diff --git a/firmware/include/sysincludes.h b/firmware/include/sysincludes.h
index a509114..be7e701 100644
--- a/firmware/include/sysincludes.h
+++ b/firmware/include/sysincludes.h
@@ -30,11 +30,6 @@
#define UINT64_RSHIFT(v, shiftby) (((uint64_t)(v)) >> (shiftby))
#define UINT64_MULT32(v, multby) (((uint64_t)(v)) * ((uint32_t)(multby)))
-/* Packing macros to support compilers such as MSVC that lack
- * __attribute__((packed)) */
-#define PACK_START
-#define PACK_STOP
-
#else
#include "biosincludes.h"
#endif
diff --git a/firmware/lib/cgptlib/include/gpt.h b/firmware/lib/cgptlib/include/gpt.h
index 79cc8b2..1d5cb58 100644
--- a/firmware/lib/cgptlib/include/gpt.h
+++ b/firmware/lib/cgptlib/include/gpt.h
@@ -12,7 +12,9 @@
#include "sysincludes.h"
-PACK_START /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(push,1) /* Support packing for MSVC. */
+#endif
#define GPT_HEADER_SIGNATURE "EFI PART"
#define GPT_HEADER_SIGNATURE_SIZE sizeof(GPT_HEADER_SIGNATURE)
@@ -115,6 +117,8 @@
#define GPTENTRY_EXPECTED_SIZE 128
-PACK_STOP /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(pop) /* Support packing for MSVC. */
+#endif
#endif /* VBOOT_REFERENCE_CGPTLIB_GPT_H_ */
diff --git a/firmware/lib/include/vboot_struct.h b/firmware/lib/include/vboot_struct.h
index b33e46d..e6240c7 100644
--- a/firmware/lib/include/vboot_struct.h
+++ b/firmware/lib/include/vboot_struct.h
@@ -11,7 +11,9 @@
#include "sysincludes.h"
-PACK_START /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(push, 1) /* Support packing for MSVC. */
+#endif
/* Public key data */
typedef struct VbPublicKey {
@@ -131,7 +133,8 @@
#define EXPECTED_VBKERNELPREAMBLEHEADER_SIZE 96
-
-PACK_STOP /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(pop) /* Support packing for MSVC. */
+#endif
#endif /* VBOOT_REFERENCE_VBOOT_STRUCT_H_ */
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index 36f09c9..6f20641 100644
--- a/firmware/lib/vboot_firmware.c
+++ b/firmware/lib/vboot_firmware.c
@@ -51,16 +51,22 @@
debug("LoadFirmware started...\n");
/* Must have a root key */
- if (!root_key)
+ if (!root_key) {
+ debug("No root key\n");
return LOAD_FIRMWARE_RECOVERY;
+ }
/* Initialize the TPM and read rollback indices. */
/* TODO: fix SetupTPM parameter for developer mode */
- if (0 != SetupTPM(RO_NORMAL_MODE, 0) )
+ if (0 != SetupTPM(RO_NORMAL_MODE, 0)) {
+ debug("SetupTPM failed\n");
return LOAD_FIRMWARE_RECOVERY;
+ }
if (0 != GetStoredVersions(FIRMWARE_VERSIONS,
- &tpm_key_version, &tpm_fw_version))
+ &tpm_key_version, &tpm_fw_version)) {
+ debug("Unable to get stored versions.\n");
return LOAD_FIRMWARE_RECOVERY;
+ }
/* Allocate our internal data */
lfi = (VbLoadFirmwareInternal*)Malloc(sizeof(VbLoadFirmwareInternal));
@@ -85,18 +91,24 @@
key_block = (VbKeyBlockHeader*)params->verification_block_1;
vblock_size = params->verification_size_1;
}
- if ((0 != KeyBlockVerify(key_block, vblock_size, root_key)))
+ if ((0 != KeyBlockVerify(key_block, vblock_size, root_key))) {
+ debug("Key block verification failed.\n");
continue;
+ }
/* Check for rollback of key version. */
key_version = key_block->data_key.key_version;
- if (key_version < tpm_key_version)
+ if (key_version < tpm_key_version) {
+ debug("Key rollback detected.\n");
continue;
+ }
/* Get the key for preamble/data verification from the key block. */
data_key = PublicKeyToRSA(&key_block->data_key);
- if (!data_key)
+ if (!data_key) {
+ debug("Unable to parse data key.\n");
continue;
+ }
/* Verify the preamble, which follows the key block. */
preamble = (VbFirmwarePreambleHeader*)((uint8_t*)key_block +
@@ -104,6 +116,7 @@
if ((0 != VerifyFirmwarePreamble2(preamble,
vblock_size - key_block->key_block_size,
data_key))) {
+ debug("Preamble verfication failed.\n");
RSAPublicKeyFree(data_key);
continue;
}
@@ -111,6 +124,7 @@
/* Check for rollback of firmware version. */
if (key_version == tpm_key_version &&
preamble->firmware_version < tpm_fw_version) {
+ debug("Firmware version rollback detected.\n");
RSAPublicKeyFree(data_key);
continue;
}
@@ -134,8 +148,14 @@
/* Read the firmware data */
DigestInit(&lfi->body_digest_context, data_key->algorithm);
lfi->body_size_accum = 0;
- if ((0 != GetFirmwareBody(params, index)) ||
- (lfi->body_size_accum != preamble->body_signature.data_size)) {
+ if (0 != GetFirmwareBody(params, index)) {
+ debug("GetFirmwareBody() failed for index %d\n", index);
+ RSAPublicKeyFree(data_key);
+ continue;
+ }
+ if (lfi->body_size_accum != preamble->body_signature.data_size) {
+ debug("Hash updated %d bytes but expected %d\n",
+ (int)lfi->body_size_accum, (int)preamble->body_signature.data_size);
RSAPublicKeyFree(data_key);
continue;
}
@@ -143,6 +163,7 @@
/* Verify firmware data */
body_digest = DigestFinal(&lfi->body_digest_context);
if (0 != VerifyDigest(body_digest, &preamble->body_signature, data_key)) {
+ debug("Firmware body verification failed.\n");
RSAPublicKeyFree(data_key);
Free(body_digest);
continue;
@@ -153,6 +174,7 @@
Free(body_digest);
/* If we're still here, the firmware is valid. */
+ debug("Firmware %d is valid.\n", index);
if (-1 == good_index) {
VbPublicKey *kdest = (VbPublicKey*)params->kernel_sign_key_blob;
@@ -160,9 +182,11 @@
PublicKeyInit(kdest, (uint8_t*)(kdest + 1),
(params->kernel_sign_key_size - sizeof(VbPublicKey)));
- if (0 != PublicKeyCopy(kdest, &preamble->kernel_subkey))
+ if (0 != PublicKeyCopy(kdest, &preamble->kernel_subkey)) {
+ debug("Kernel subkey too big for buffer.\n");
continue; /* The firmware signature was good, but the public
* key was bigger that the caller can handle. */
+ }
/* Save the key size we actually used */
params->kernel_sign_key_size = kdest->key_offset + kdest->key_size;
@@ -195,20 +219,26 @@
lowest_fw_version > tpm_fw_version)) {
if (0 != WriteStoredVersions(FIRMWARE_VERSIONS,
(uint16_t)lowest_key_version,
- (uint16_t)lowest_fw_version))
+ (uint16_t)lowest_fw_version)) {
+ debug("Unable to write stored versions.\n");
return LOAD_FIRMWARE_RECOVERY;
+ }
}
/* Lock Firmware TPM rollback indices from further writes. In
* this design, this is done by setting the globalLock bit, which
* is cleared only by TPM_Init at reboot. */
- if (0 != LockFirmwareVersions())
+ if (0 != LockFirmwareVersions()) {
+ debug("Unable to lock firmware versions.\n");
return LOAD_FIRMWARE_RECOVERY;
+ }
/* Success */
+ debug("Will boot firmware index %d\n", (int)params->firmware_index);
return LOAD_FIRMWARE_SUCCESS;
}
/* If we're still here, no good firmware, so go to recovery mode. */
+ debug("Alas, no good firmware.\n");
return LOAD_FIRMWARE_RECOVERY;
}
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index c3b3423..d26ef6f 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -322,7 +322,7 @@
/* TODO: GPT partitions start at 1, but cgptlib starts them at 0.
* Adjust here, until cgptlib is fixed. */
good_partition = gpt.current_kernel + 1;
- params->partition_number = gpt.current_kernel;
+ params->partition_number = gpt.current_kernel + 1;
params->bootloader_address = preamble->bootloader_address;
params->bootloader_size = preamble->bootloader_size;
/* If we're in developer or recovery mode, there's no rollback