Fix bug in GetLogicalFirmwareVersion().

src/platform/vboot_reference/vfirmware/firmware_image_fw.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.
  *
  * Functions for verifying a verified boot firmware image.
  * (Firmware Portion)
  */
 
 #include "firmware_image_fw.h"
 
@@ skipping 212 matching lines @@
          verification_header_blob + (FIELD_LEN(magic) +  /* Offset to field. */
                                      FIELD_LEN(header_len) +
                                      FIELD_LEN(firmware_sign_algorithm)),
          sizeof(firmware_key_version));
   if (firmware_sign_algorithm >= kNumAlgorithms)
     return 0;
   firmware_sign_key_len = RSAProcessedKeySize(firmware_sign_algorithm);
   Memcpy(&firmware_version,
          verification_header_blob +  (FIELD_LEN(magic) +  /* Offset to field. */
                                       FIELD_LEN(header_len) +
+                                      FIELD_LEN(firmware_sign_algorithm) +
                                       FIELD_LEN(firmware_key_version) +
                                       firmware_sign_key_len +
                                       FIELD_LEN(header_checksum) +
                                       FIELD_LEN(firmware_key_signature)),
          sizeof(firmware_version));
   return CombineUint16Pair(firmware_key_version, firmware_version);
 }
 
 int VerifyFirmwareDriver_f(uint8_t* root_key_blob,
                            uint8_t* verification_headerA,
@@ skipping 78 matching lines @@
      */
     if (stored_lversion <= firmwareB_lversion &&
         (VERIFY_FIRMWARE_SUCCESS == VerifyFirmware(root_key_blob,
                                                    verification_headerB,
                                                    firmwareB)))
         return BOOT_FIRMWARE_B_CONTINUE;
   }
   /* D'oh: No bootable firmware. */
   return BOOT_FIRMWARE_RECOVERY_CONTINUE;
 }