add entire FMAP structure into ROM hash

client/site_tests/hardware_Components/hardware_Components.py

 # 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.
 
 import glob, hashlib, logging, os, pprint, re, sys
 from autotest_lib.client.bin import factory
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import flashrom_util
 from autotest_lib.client.common_lib import gbb_util
+from autotest_lib.client.common_lib import site_fmap
 from autotest_lib.client.common_lib import site_vblock
 
 
 class hardware_Components(test.test):
     version = 1
     _cids = [
         'hash_ro_firmware',
         'part_id_audio_codec',
         'part_id_cpu',
         'part_id_display_panel',
@@ skipping 232 matching lines @@
         base_img = flashrom.read_whole()
         flashrom_size = len(base_img)
         # XXX Allowing the FMAP to override our default layout may be an exploit
         # here, because vendor can provide fake (non-used) GBB/BSTUB in unused
         # area.  However since the flash memory layout may change, we need to
         # trust FMAP here.
         layout = flashrom.detect_chromeos_bios_layout(flashrom_size, base_img)
         if not layout:
             raise error.TestError('Cannot detect ChromeOS flashrom layout')
         hash_src = ''
+        fmap_obj = site_fmap.fmap_decode(base_img)
+        if not fmap_obj:
+            raise error.TestError('No FMAP structure in flashrom.')
+        hash_src = hash_src + site_fmap.fmap_encode(fmap_obj)
         for section in hash_ro_list:
             src = flashrom.get_section(base_img, layout, section)
             if not src:
                 raise error.TestError('Cannot get section [%s] from flashrom' %
                                       section)
             hash_src = hash_src + src
         if not hash_src:
             raise error.TestError('Invalid hash source from flashrom.')
         return hashlib.sha256(hash_src).hexdigest()
 
@@ skipping 102 matching lines @@
                 cids_need_to_be_record = ['part_id_hwqual']
                 for cid in cids_need_to_be_record:
                     factory.log_shared_data(cid, self._approved[cid][0])
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(all_failures)