Make SAFT use layout retrieved from the BIOS image.

saft/test_kernel_handler.py

 #!/usr/bin/python
 # 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.
 
 '''Unit test for kernel_handler module.
 
 Allows to verify kernel corrupt and restore actions.
 '''
 
@@ skipping 19 matching lines @@
 
 def get_kernel_key(section, pubkey_file):
     '''Retrieve from firmware the public key used to verify the kernel.
 
     Skip the keyblock to reach the firmware preamble. Find out where the
     public key is and extract it into a separate file, adjusting the header's
     'offset' value.
     '''
     fum = flashrom_util.flashrom_util()
     image = fum.read_whole()
-    layout = fum.detect_chromeos_layout('bios', len(image))
     # get the block header
-    kblock = fum.get_section(image, layout, 'VBOOT' + section)
+    kblock = fum.get_section(image, 'VBOOT' + section)
     kbsize = struct.unpack_from(KEYBLOCK_SIZE_ACCESS_FORMAT, kblock)[1]
 
     pk_base_offset = kbsize + FW_PREAMBLE_PUBKEY_OFFSET
     offset, size, alg, version = struct.unpack_from(
         PUBKEY_HEADER_FORMAT, kblock[pk_base_offset:])
 
     key_data_offset = pk_base_offset + offset
 
     # Retrieve the public key and save it in a file.
     pub_key = struct.pack('<QQQQ%ds' % size, 32, size, alg, version,
@@ skipping 88 matching lines @@
             self.backup_file = None
         shutil.rmtree(self.tmpd)
 
 
 if __name__ == '__main__':
     unittest.main()