Support dev vs consumer firmware in vboot_reference

firmware/lib/vboot_firmware.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * High-level firmware API for loading and verifying rewritable firmware.
  * (Firmware portion)
  */
 
 #include "load_firmware_fw.h"
 #include "rollback_index.h"
@@ skipping 22 matching lines @@
 
 int LoadFirmware(LoadFirmwareParams* params) {
 
   VbPublicKey* root_key = (VbPublicKey*)params->firmware_root_key_blob;
   VbLoadFirmwareInternal* lfi;
 
   uint32_t tpm_version = 0;
   uint64_t lowest_version = 0xFFFFFFFF;
   uint32_t status;
   int good_index = -1;
+  int is_dev;
   int index;
 
   /* Clear output params in case we fail */
   params->firmware_index = 0;
 
   VBDEBUG(("LoadFirmware started...\n"));
 
   if (params->kernel_sign_key_size < sizeof(VbPublicKey)) {
     VBDEBUG(("Kernel sign key buffer too small\n"));
     return LOAD_FIRMWARE_RECOVERY;
   }
 
   /* Must have a root key */
   if (!root_key) {
     VBDEBUG(("No root key\n"));
     return LOAD_FIRMWARE_RECOVERY;
   }
 
+  /* Parse flags */
+  is_dev = (params->boot_flags & BOOT_FLAG_DEVELOPER ? 1 : 0);
+
   /* Initialize the TPM and read rollback indices. */
   VBPERFSTART("VB_TPMI");
-  status = RollbackFirmwareSetup(params->boot_flags & BOOT_FLAG_DEVELOPER,
-                                 &tpm_version);
+  status = RollbackFirmwareSetup(is_dev, &tpm_version);
   if (0 != status) {
     VBDEBUG(("Unable to setup TPM and read stored versions.\n"));
     VBPERFEND("VB_TPMI");
     return (status == TPM_E_MUST_REBOOT ?
             LOAD_FIRMWARE_REBOOT : LOAD_FIRMWARE_RECOVERY_TPM);
   }
   VBPERFEND("VB_TPMI");
 
   /* Allocate our internal data */
   lfi = (VbLoadFirmwareInternal*)Malloc(sizeof(VbLoadFirmwareInternal));
@@ skipping 21 matching lines @@
       key_block = (VbKeyBlockHeader*)params->verification_block_1;
       vblock_size = params->verification_size_1;
     }
     if ((0 != KeyBlockVerify(key_block, vblock_size, root_key, 0))) {
       VBDEBUG(("Key block verification failed.\n"));
       VBPERFEND("VB_VKB");
       continue;
     }
     VBPERFEND("VB_VKB");
 
+    /* Check the key block flags against the current boot mode. */
+    if (!(key_block->key_block_flags &
+          (is_dev ? KEY_BLOCK_FLAG_DEVELOPER_1 :
+           KEY_BLOCK_FLAG_DEVELOPER_0))) {
+      VBDEBUG(("Developer flag mismatch.\n"));
+      continue;
+    }
+    /* RW firmware never runs in recovery mode. */
+    if (!(key_block->key_block_flags & KEY_BLOCK_FLAG_RECOVERY_0)) {
+      VBDEBUG(("Recovery flag mismatch.\n"));
+      continue;
+    }
+
     /* Check for rollback of key version. */
     key_version = key_block->data_key.key_version;
     if (key_version < (tpm_version >> 16)) {
       VBDEBUG(("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) {
@@ skipping 146 matching lines @@
   /* Resume the TPM */
   uint32_t status = RollbackS3Resume();
 
   if (status == TPM_SUCCESS)
     return LOAD_FIRMWARE_SUCCESS;
   else if (status == TPM_E_MUST_REBOOT)
     return LOAD_FIRMWARE_REBOOT;
   else
     return LOAD_FIRMWARE_RECOVERY_TPM;
 }