Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release

Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 251 insertions, 228 deletions

diff --git a/extra/usb_serial/console.py b/extra/usb_serial/console.py
index d06b33ce23..2b0ecd5f13 100755
--- a/extra/usb_serial/console.py
+++ b/extra/usb_serial/console.py
@@ -1,17 +1,14 @@
-#!/usr/bin/env python
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-#
-# Ignore indention messages, since legacy scripts use 2 spaces instead of 4.
-# pylint: disable=bad-indentation,docstring-section-indent
-# pylint: disable=docstring-trailing-quotes
 
 """Allow creation of uart/console interface via usb google serial endpoint."""
 
 # Note: This is a py2/3 compatible file.
 
 from __future__ import print_function
+
 import argparse
 import array
 import os
@@ -19,25 +16,25 @@ import sys
 import termios
 import threading
 import time
-import traceback
 import tty
+
 try:
-  import usb
-except:
-  print("import usb failed")
-  print("try running these commands:")
-  print(" sudo apt-get install python-pip")
-  print(" sudo pip install --pre pyusb")
-  print()
-  sys.exit(-1)
+    import usb  # pylint:disable=import-error
+except ModuleNotFoundError:
+    print("import usb failed")
+    print("try running these commands:")
+    print(" sudo apt-get install python-pip")
+    print(" sudo pip install --pre pyusb")
+    print()
+    sys.exit(-1)
 
 import six
 
 
 def GetBuffer(stream):
-  if six.PY3:
-    return stream.buffer
-  return stream
+    if six.PY3:
+        return stream.buffer
+    return stream
 
 
 """Class Susb covers USB device discovery and initialization.
@@ -46,99 +43,103 @@ def GetBuffer(stream):
   and interface number.
 """
 
+
 class SusbError(Exception):
-  """Class for exceptions of Susb."""
-  def __init__(self, msg, value=0):
-    """SusbError constructor.
+    """Class for exceptions of Susb."""
 
-    Args:
-      msg: string, message describing error in detail
-      value: integer, value of error when non-zero status returned.  Default=0
-    """
-    super(SusbError, self).__init__(msg, value)
-    self.msg = msg
-    self.value = value
-
-class Susb():
-  """Provide USB functionality.
-
-  Instance Variables:
-  _read_ep: pyUSB read endpoint for this interface
-  _write_ep: pyUSB write endpoint for this interface
-  """
-  READ_ENDPOINT = 0x81
-  WRITE_ENDPOINT = 0x1
-  TIMEOUT_MS = 100
-
-  def __init__(self, vendor=0x18d1,
-               product=0x500f, interface=1, serialname=None):
-    """Susb constructor.
-
-    Discovers and connects to USB endpoints.
-
-    Args:
-      vendor    : usb vendor id of device
-      product   : usb product id of device
-      interface : interface number ( 1 - 8 ) of device to use
-      serialname: string of device serialnumber.
-
-    Raises:
-      SusbError: An error accessing Susb object
+    def __init__(self, msg, value=0):
+        """SusbError constructor.
+
+        Args:
+          msg: string, message describing error in detail
+          value: integer, value of error when non-zero status returned.  Default=0
+        """
+        super(SusbError, self).__init__(msg, value)
+        self.msg = msg
+        self.value = value
+
+
+class Susb:
+    """Provide USB functionality.
+
+    Instance Variables:
+    _read_ep: pyUSB read endpoint for this interface
+    _write_ep: pyUSB write endpoint for this interface
     """
-    # Find the device.
-    dev_g = usb.core.find(idVendor=vendor, idProduct=product, find_all=True)
-    dev_list = list(dev_g)
-    if dev_list is None:
-      raise SusbError("USB device not found")
-
-    # Check if we have multiple devices.
-    dev = None
-    if serialname:
-      for d in dev_list:
-        dev_serial = "PyUSB doesn't have a stable interface"
-        try:
-          dev_serial = usb.util.get_string(d, 256, d.iSerialNumber)
-        except:
-          dev_serial = usb.util.get_string(d, d.iSerialNumber)
-        if dev_serial == serialname:
-          dev = d
-          break
-      if dev is None:
-        raise SusbError("USB device(%s) not found" % (serialname,))
-    else:
-      try:
-        dev = dev_list[0]
-      except:
-        try:
-          dev = dev_list.next()
-        except:
-          raise SusbError("USB device %04x:%04x not found" % (vendor, product))
 
-    # If we can't set configuration, it's already been set.
-    try:
-      dev.set_configuration()
-    except usb.core.USBError:
-      pass
+    READ_ENDPOINT = 0x81
+    WRITE_ENDPOINT = 0x1
+    TIMEOUT_MS = 100
+
+    def __init__(
+        self, vendor=0x18D1, product=0x500F, interface=1, serialname=None
+    ):
+        """Susb constructor.
+
+        Discovers and connects to USB endpoints.
+
+        Args:
+          vendor: usb vendor id of device
+          product: usb product id of device
+          interface: interface number ( 1 - 8 ) of device to use
+          serialname: string of device serialnumber.
+
+        Raises:
+          SusbError: An error accessing Susb object
+        """
+        # Find the device.
+        dev_g = usb.core.find(idVendor=vendor, idProduct=product, find_all=True)
+        dev_list = list(dev_g)
+        if dev_list is None:
+            raise SusbError("USB device not found")
+
+        # Check if we have multiple devices.
+        dev = None
+        if serialname:
+            for d in dev_list:
+                dev_serial = usb.util.get_string(d, d.iSerialNumber)
+                if dev_serial == serialname:
+                    dev = d
+                    break
+            if dev is None:
+                raise SusbError("USB device(%s) not found" % (serialname,))
+        else:
+            try:
+                dev = dev_list[0]
+            except IndexError:
+                raise SusbError(
+                    "USB device %04x:%04x not found" % (vendor, product)
+                )
+
+        # If we can't set configuration, it's already been set.
+        try:
+            dev.set_configuration()
+        except usb.core.USBError:
+            pass
 
-    # Get an endpoint instance.
-    cfg = dev.get_active_configuration()
-    intf = usb.util.find_descriptor(cfg, bInterfaceNumber=interface)
-    self._intf = intf
+        # Get an endpoint instance.
+        cfg = dev.get_active_configuration()
+        intf = usb.util.find_descriptor(cfg, bInterfaceNumber=interface)
+        self._intf = intf
 
-    if not intf:
-      raise SusbError("Interface not found")
+        if not intf:
+            raise SusbError("Interface not found")
 
-    # Detach raiden.ko if it is loaded.
-    if dev.is_kernel_driver_active(intf.bInterfaceNumber) is True:
+        # Detach raiden.ko if it is loaded.
+        if dev.is_kernel_driver_active(intf.bInterfaceNumber) is True:
             dev.detach_kernel_driver(intf.bInterfaceNumber)
 
-    read_ep_number = intf.bInterfaceNumber + self.READ_ENDPOINT
-    read_ep = usb.util.find_descriptor(intf, bEndpointAddress=read_ep_number)
-    self._read_ep = read_ep
+        read_ep_number = intf.bInterfaceNumber + self.READ_ENDPOINT
+        read_ep = usb.util.find_descriptor(
+            intf, bEndpointAddress=read_ep_number
+        )
+        self._read_ep = read_ep
 
-    write_ep_number = intf.bInterfaceNumber + self.WRITE_ENDPOINT
-    write_ep = usb.util.find_descriptor(intf, bEndpointAddress=write_ep_number)
-    self._write_ep = write_ep
+        write_ep_number = intf.bInterfaceNumber + self.WRITE_ENDPOINT
+        write_ep = usb.util.find_descriptor(
+            intf, bEndpointAddress=write_ep_number
+        )
+        self._write_ep = write_ep
 
 
 """Suart class implements a stream interface, to access Google's USB class.
@@ -147,90 +148,96 @@ class Susb():
   and forwards them across. This particular class is hardcoded to stdin/out.
 """
 
-class SuartError(Exception):
-  """Class for exceptions of Suart."""
-  def __init__(self, msg, value=0):
-    """SuartError constructor.
-
-    Args:
-      msg: string, message describing error in detail
-      value: integer, value of error when non-zero status returned.  Default=0
-    """
-    super(SuartError, self).__init__(msg, value)
-    self.msg = msg
-    self.value = value
-
-
-class Suart():
-  """Provide interface to serial usb endpoint."""
-
-  def __init__(self, vendor=0x18d1, product=0x501c, interface=0,
-               serialname=None):
-    """Suart contstructor.
-
-    Initializes USB stream interface.
-
-    Args:
-      vendor: usb vendor id of device
-      product: usb product id of device
-      interface: interface number of device to use
-      serialname: Defaults to None.
-
-    Raises:
-      SuartError: If init fails
-    """
-    self._done = threading.Event()
-    self._susb = Susb(vendor=vendor, product=product,
-        interface=interface, serialname=serialname)
-
-  def wait_until_done(self, timeout=None):
-    return self._done.wait(timeout=timeout)
-
-  def run_rx_thread(self):
-    try:
-      while True:
-          try:
-            r = self._susb._read_ep.read(64, self._susb.TIMEOUT_MS)
-            if r:
-              GetBuffer(sys.stdout).write(r.tobytes())
-              GetBuffer(sys.stdout).flush()
-
-          except Exception as e:
-            # If we miss some characters on pty disconnect, that's fine.
-            # ep.read() also throws USBError on timeout, which we discard.
-            if not isinstance(e, (OSError, usb.core.USBError)):
-              print("rx %s" % e)
-    finally:
-      self._done.set()
-
-  def run_tx_thread(self):
-    try:
-      while True:
-          try:
-            r = GetBuffer(sys.stdin).read(1)
-            if not r or r == b"\x03":
-              break
-            if r:
-              self._susb._write_ep.write(array.array('B', r),
-                                         self._susb.TIMEOUT_MS)
-          except Exception as e:
-            print("tx %s" % e)
-    finally:
-      self._done.set()
-
-  def run(self):
-    """Creates pthreads to poll USB & PTY for data.
-    """
-    self._exit = False
-
-    self._rx_thread = threading.Thread(target=self.run_rx_thread)
-    self._rx_thread.daemon = True
-    self._rx_thread.start()
-
-    self._tx_thread = threading.Thread(target=self.run_tx_thread)
-    self._tx_thread.daemon = True
-    self._tx_thread.start()
 
+class SuartError(Exception):
+    """Class for exceptions of Suart."""
+
+    def __init__(self, msg, value=0):
+        """SuartError constructor.
+
+        Args:
+          msg: string, message describing error in detail
+          value: integer, value of error when non-zero status returned.  Default=0
+        """
+        super(SuartError, self).__init__(msg, value)
+        self.msg = msg
+        self.value = value
+
+
+class Suart:
+    """Provide interface to serial usb endpoint."""
+
+    def __init__(
+        self, vendor=0x18D1, product=0x501C, interface=0, serialname=None
+    ):
+        """Suart contstructor.
+
+        Initializes USB stream interface.
+
+        Args:
+          vendor: usb vendor id of device
+          product: usb product id of device
+          interface: interface number of device to use
+          serialname: Defaults to None.
+
+        Raises:
+          SuartError: If init fails
+        """
+        self._done = threading.Event()
+        self._susb = Susb(
+            vendor=vendor,
+            product=product,
+            interface=interface,
+            serialname=serialname,
+        )
+
+    def wait_until_done(self, timeout=None):
+        return self._done.wait(timeout=timeout)
+
+    def run_rx_thread(self):
+        try:
+            while True:
+                try:
+                    r = self._susb._read_ep.read(64, self._susb.TIMEOUT_MS)
+                    if r:
+                        GetBuffer(sys.stdout).write(r.tobytes())
+                        GetBuffer(sys.stdout).flush()
+
+                except Exception as e:
+                    # If we miss some characters on pty disconnect, that's fine.
+                    # ep.read() also throws USBError on timeout, which we discard.
+                    if not isinstance(e, (OSError, usb.core.USBError)):
+                        print("rx %s" % e)
+        finally:
+            self._done.set()
+
+    def run_tx_thread(self):
+        try:
+            while True:
+                try:
+                    r = GetBuffer(sys.stdin).read(1)
+                    if not r or r == b"\x03":
+                        break
+                    if r:
+                        self._susb._write_ep.write(
+                            array.array("B", r), self._susb.TIMEOUT_MS
+                        )
+                except Exception as e:
+                    print("tx %s" % e)
+        finally:
+            self._done.set()
+
+    def run(self):
+        """Creates pthreads to poll USB & PTY for data."""
+        self._exit = False
+
+        self._rx_thread = threading.Thread(target=self.run_rx_thread)
+        self._rx_thread.daemon = True
+        self._rx_thread.start()
+
+        self._tx_thread = threading.Thread(target=self.run_tx_thread)
+        self._tx_thread.daemon = True
+        self._tx_thread.start()
 
 
 """Command line functionality
@@ -239,60 +246,76 @@ class Suart():
   Ctrl-C exits.
 """
 
-parser = argparse.ArgumentParser(description="Open a console to a USB device")
-parser.add_argument('-d', '--device', type=str,
-    help="vid:pid of target device", default="18d1:501c")
-parser.add_argument('-i', '--interface', type=int,
-    help="interface number of console", default=0)
-parser.add_argument('-s', '--serialno', type=str,
-    help="serial number of device", default="")
-parser.add_argument('-S', '--notty-exit-sleep', type=float, default=0.2,
-    help="When stdin is *not* a TTY, wait this many seconds after EOF from "
-    "stdin before exiting, to give time for receiving a reply from the USB "
-    "device.")
+parser = argparse.ArgumentParser(
+    description="Open a console to a USB device",
+    formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+)
+parser.add_argument(
+    "-d",
+    "--device",
+    type=str,
+    help="vid:pid of target device",
+    default="18d1:501c",
+)
+parser.add_argument(
+    "-i", "--interface", type=int, help="interface number of console", default=0
+)
+parser.add_argument(
+    "-s", "--serialno", type=str, help="serial number of device", default=""
+)
+parser.add_argument(
+    "-S",
+    "--notty-exit-sleep",
+    type=float,
+    default=0.2,
+    help="When stdin is *not* a TTY, wait this many seconds "
+    "after EOF from stdin before exiting, to give time for "
+    "receiving a reply from the USB device.",
+)
 
 
 def runconsole():
-  """Run the usb console code
+    """Run the usb console code
 
-  Starts the pty thread, and idles until a ^C is caught.
-  """
-  args = parser.parse_args()
+    Starts the pty thread, and idles until a ^C is caught.
+    """
+    args = parser.parse_args()
 
-  vidstr, pidstr = args.device.split(':')
-  vid = int(vidstr, 16)
-  pid = int(pidstr, 16)
+    vidstr, pidstr = args.device.split(":")
+    vid = int(vidstr, 16)
+    pid = int(pidstr, 16)
 
-  serialno = args.serialno
-  interface = args.interface
+    serialno = args.serialno
+    interface = args.interface
 
-  sobj = Suart(vendor=vid, product=pid, interface=interface,
-               serialname=serialno)
-  if sys.stdin.isatty():
-    tty.setraw(sys.stdin.fileno())
-  sobj.run()
-  sobj.wait_until_done()
-  if not sys.stdin.isatty() and args.notty_exit_sleep > 0:
-    time.sleep(args.notty_exit_sleep)
+    sobj = Suart(
+        vendor=vid, product=pid, interface=interface, serialname=serialno
+    )
+    if sys.stdin.isatty():
+        tty.setraw(sys.stdin.fileno())
+    sobj.run()
+    sobj.wait_until_done()
+    if not sys.stdin.isatty() and args.notty_exit_sleep > 0:
+        time.sleep(args.notty_exit_sleep)
 
 
 def main():
-  stdin_isatty = sys.stdin.isatty()
-  if stdin_isatty:
-    fd = sys.stdin.fileno()
-    os.system("stty -echo")
-    old_settings = termios.tcgetattr(fd)
-
-  try:
-    runconsole()
-  finally:
+    stdin_isatty = sys.stdin.isatty()
     if stdin_isatty:
-      termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-      os.system("stty echo")
-    # Avoid having the user's shell prompt start mid-line after the final output
-    # from this program.
-    print()
+        fd = sys.stdin.fileno()
+        os.system("stty -echo")
+        old_settings = termios.tcgetattr(fd)
+
+    try:
+        runconsole()
+    finally:
+        if stdin_isatty:
+            termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+            os.system("stty echo")
+        # Avoid having the user's shell prompt start mid-line after the final output
+        # from this program.
+        print()
 
 
-if __name__ == '__main__':
-  main()
+if __name__ == "__main__":
+    main()