scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-28 20:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

TBR: wfrichar

Browse Source 
Fix LoadKernel() checking key block flags

BUG=none
TEST=none
This commit is contained in:
Randall Spangler
2010-06-29 19:08:43 -07:00
parent 4d78d9a4fb
commit c4a011a725
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/lib/vboot_kernel.c
View File

@@ -126,8 +126,8 @@ int LoadKernel(LoadKernelParams* params) {
uint16_t tpm_kernel_version = 0; uint16_t tpm_kernel_version = 0;
uint64_t lowest_key_version = 0xFFFF; uint64_t lowest_key_version = 0xFFFF;
uint64_t lowest_kernel_version = 0xFFFF; uint64_t lowest_kernel_version = 0xFFFF;
int is_dev = (BOOT_FLAG_DEVELOPER & params->boot_flags); int is_dev = (BOOT_FLAG_DEVELOPER & params->boot_flags ? 1 : 0);
int is_rec = (BOOT_FLAG_RECOVERY & params->boot_flags); int is_rec = (BOOT_FLAG_RECOVERY & params->boot_flags ? 1 : 0);
int is_normal = (!is_dev && !is_rec); int is_normal = (!is_dev && !is_rec);
/* Clear output params in case we fail */ /* Clear output params in case we fail */
@@ -205,13 +205,13 @@ int LoadKernel(LoadKernelParams* params) {
} }
/* Check the key block flags against the current boot mode */ /* Check the key block flags against the current boot mode */
if (!(key_block->key_block_flags && if (!(key_block->key_block_flags &
(is_dev ? KEY_BLOCK_FLAG_DEVELOPER_1 : (is_dev ? KEY_BLOCK_FLAG_DEVELOPER_1 :
KEY_BLOCK_FLAG_DEVELOPER_0))) { KEY_BLOCK_FLAG_DEVELOPER_0))) {
VBDEBUG(("Developer flag mismatch.\n")); VBDEBUG(("Developer flag mismatch.\n"));
continue; continue;
} }
if (!(key_block->key_block_flags && if (!(key_block->key_block_flags &
(is_rec ? KEY_BLOCK_FLAG_RECOVERY_1 : (is_rec ? KEY_BLOCK_FLAG_RECOVERY_1 :
KEY_BLOCK_FLAG_RECOVERY_0))) { KEY_BLOCK_FLAG_RECOVERY_0))) {
VBDEBUG(("Recovery flag mismatch.\n")); VBDEBUG(("Recovery flag mismatch.\n"));

2
firmware/version.c
View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=fa22aa71"; char* VbootVersion = "VBOOv=3b14b77c";