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, 117 insertions, 37 deletions

diff --git a/util/inject-keys.py b/util/inject-keys.py
index bd10b693ad..7ff72ea134 100755
--- a/util/inject-keys.py
+++ b/util/inject-keys.py
@@ -1,57 +1,133 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# 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.
 
 # Note: This is a py2/3 compatible file.
 
 from __future__ import print_function
+
 import string
 import subprocess
 import sys
 
-
-KEYMATRIX = {'`': (3, 1), '1': (6, 1), '2': (6, 4), '3': (6, 2), '4': (6, 3),
-             '5': (3, 3), '6': (3, 6), '7': (6, 6), '8': (6, 5), '9': (6, 9),
-             '0': (6, 8), '-': (3, 8), '=': (0, 8), 'q': (7, 1), 'w': (7, 4),
-             'e': (7, 2), 'r': (7, 3), 't': (2, 3), 'y': (2, 6), 'u': (7, 6),
-             'i': (7, 5), 'o': (7, 9), 'p': (7, 8), '[': (2, 8), ']': (2, 5),
-             '\\': (3, 11), 'a': (4, 1), 's': (4, 4), 'd': (4, 2), 'f': (4, 3),
-             'g': (1, 3), 'h': (1, 6), 'j': (4, 6), 'k': (4, 5), 'l': (4, 9),
-             ';': (4, 8), '\'': (1, 8), 'z': (5, 1), 'x': (5, 4), 'c': (5, 2),
-             'v': (5, 3), 'b': (0, 3), 'n': (0, 6), 'm': (5, 6), ',': (5, 5),
-             '.': (5, 9), '/': (5, 8), ' ': (5, 11), '<right>': (6, 12),
-             '<alt_r>': (0, 10), '<down>': (6, 11), '<tab>': (2, 1),
-             '<f10>': (0, 4), '<shift_r>': (7, 7), '<ctrl_r>': (4, 0),
-             '<esc>': (1, 1), '<backspace>': (1, 11), '<f2>': (3, 2),
-             '<alt_l>': (6, 10), '<ctrl_l>': (2, 0), '<f1>': (0, 2),
-             '<search>': (0, 1), '<f3>': (2, 2), '<f4>': (1, 2), '<f5>': (3, 4),
-             '<f6>': (2, 4), '<f7>': (1, 4), '<f8>': (2, 9), '<f9>': (1, 9),
-             '<up>': (7, 11), '<shift_l>': (5, 7), '<enter>': (4, 11),
-             '<left>': (7, 12)}
-
-
-UNSHIFT_TABLE = { '~': '`', '!': '1', '@': '2', '#': '3', '$': '4',
-                  '%': '5', '^': '6', '&': '7', '*': '8', '(': '9',
-                  ')': '0', '_': '-', '+': '=', '{': '[', '}': ']',
-                  '|': '\\',
-                  ':': ';', '"': "'", '<': ',', '>': '.', '?': '/'}
+KEYMATRIX = {
+    "`": (3, 1),
+    "1": (6, 1),
+    "2": (6, 4),
+    "3": (6, 2),
+    "4": (6, 3),
+    "5": (3, 3),
+    "6": (3, 6),
+    "7": (6, 6),
+    "8": (6, 5),
+    "9": (6, 9),
+    "0": (6, 8),
+    "-": (3, 8),
+    "=": (0, 8),
+    "q": (7, 1),
+    "w": (7, 4),
+    "e": (7, 2),
+    "r": (7, 3),
+    "t": (2, 3),
+    "y": (2, 6),
+    "u": (7, 6),
+    "i": (7, 5),
+    "o": (7, 9),
+    "p": (7, 8),
+    "[": (2, 8),
+    "]": (2, 5),
+    "\\": (3, 11),
+    "a": (4, 1),
+    "s": (4, 4),
+    "d": (4, 2),
+    "f": (4, 3),
+    "g": (1, 3),
+    "h": (1, 6),
+    "j": (4, 6),
+    "k": (4, 5),
+    "l": (4, 9),
+    ";": (4, 8),
+    "'": (1, 8),
+    "z": (5, 1),
+    "x": (5, 4),
+    "c": (5, 2),
+    "v": (5, 3),
+    "b": (0, 3),
+    "n": (0, 6),
+    "m": (5, 6),
+    ",": (5, 5),
+    ".": (5, 9),
+    "/": (5, 8),
+    " ": (5, 11),
+    "<right>": (6, 12),
+    "<alt_r>": (0, 10),
+    "<down>": (6, 11),
+    "<tab>": (2, 1),
+    "<f10>": (0, 4),
+    "<shift_r>": (7, 7),
+    "<ctrl_r>": (4, 0),
+    "<esc>": (1, 1),
+    "<backspace>": (1, 11),
+    "<f2>": (3, 2),
+    "<alt_l>": (6, 10),
+    "<ctrl_l>": (2, 0),
+    "<f1>": (0, 2),
+    "<search>": (0, 1),
+    "<f3>": (2, 2),
+    "<f4>": (1, 2),
+    "<f5>": (3, 4),
+    "<f6>": (2, 4),
+    "<f7>": (1, 4),
+    "<f8>": (2, 9),
+    "<f9>": (1, 9),
+    "<up>": (7, 11),
+    "<shift_l>": (5, 7),
+    "<enter>": (4, 11),
+    "<left>": (7, 12),
+}
+
+
+UNSHIFT_TABLE = {
+    "~": "`",
+    "!": "1",
+    "@": "2",
+    "#": "3",
+    "$": "4",
+    "%": "5",
+    "^": "6",
+    "&": "7",
+    "*": "8",
+    "(": "9",
+    ")": "0",
+    "_": "-",
+    "+": "=",
+    "{": "[",
+    "}": "]",
+    "|": "\\",
+    ":": ";",
+    '"': "'",
+    "<": ",",
+    ">": ".",
+    "?": "/",
+}
 
 for c in string.ascii_lowercase:
     UNSHIFT_TABLE[c.upper()] = c
 
 
 def inject_event(key, press):
-    if len(key) >= 2 and key[0] != '<':
-        key = '<' + key + '>'
+    if len(key) >= 2 and key[0] != "<":
+        key = "<" + key + ">"
     if key not in KEYMATRIX:
         print("%s: invalid key: %s" % (this_script, key))
         sys.exit(1)
     (row, col) = KEYMATRIX[key]
-    subprocess.call(["ectool", "kbpress", str(row), str(col),
-                     "1" if press else "0"])
+    subprocess.call(
+        ["ectool", "kbpress", str(row), str(col), "1" if press else "0"]
+    )
 
 
 def inject_key(key):
@@ -73,8 +149,10 @@ def inject_string(string):
 
 
 def usage():
-    print("Usage: %s [-s <string>] [-k <key>]" % this_script,
-          "[-p <pressed-key>] [-r <released-key>] ...")
+    print(
+        "Usage: %s [-s <string>] [-k <key>]" % this_script,
+        "[-p <pressed-key>] [-r <released-key>] ...",
+    )
     print("Examples:")
     print("%s -s MyPassw0rd -k enter" % this_script)
     print("%s -p ctrl_l -p alt_l -k f3 -r alt_l -r ctrl_l" % this_script)
@@ -85,7 +163,7 @@ def help():
     print("Valid keys are:")
     i = 0
     for key in KEYMATRIX:
-        print("%12s" % key, end='')
+        print("%12s" % key, end="")
         i += 1
         if i % 4 == 0:
             print()
@@ -114,12 +192,14 @@ usage_check(arg_len > 1, "not enough arguments")
 usage_check(arg_len % 2 == 1, "mismatched arguments")
 
 for i in range(1, arg_len, 2):
-    usage_check(sys.argv[i] in ("-s", "-k", "-p", "-r"),
-                "unknown flag: %s" % sys.argv[i])
+    usage_check(
+        sys.argv[i] in ("-s", "-k", "-p", "-r"),
+        "unknown flag: %s" % sys.argv[i],
+    )
 
 for i in range(1, arg_len, 2):
     flag = sys.argv[i]
-    arg = sys.argv[i+1]
+    arg = sys.argv[i + 1]
     if flag == "-s":
         inject_string(arg)
     elif flag == "-k":