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

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

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey 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
a0751778f4 board/nocturne_fp/ro_workarounds.c: 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
58f0246dbe board/nocturne_fp/board_ro.c: 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
84e53a65da board/nocturne_fp/board.h: 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
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:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     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 "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 63 insertions, 39 deletions

diff --git a/fuzz/usb_pd_fuzz.c b/fuzz/usb_pd_fuzz.c
index 64eb0913a6..bb462b9e61 100644
--- a/fuzz/usb_pd_fuzz.c
+++ b/fuzz/usb_pd_fuzz.c
@@ -1,10 +1,9 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Test USB PD module.
  */
-#define HIDE_EC_STDLIB
 #include "common.h"
 #include "task.h"
 #include "tcpm/tcpm.h"
@@ -20,17 +19,26 @@
 
 #define TASK_EVENT_FUZZ TASK_EVENT_CUSTOM_BIT(0)
 
-#define PORT0	0
+#define PORT0 0
 
-static int mock_tcpm_init(int port) { return EC_SUCCESS; }
-static int mock_tcpm_release(int port) { return EC_SUCCESS; }
+static int mock_tcpm_init(int port)
+{
+	return EC_SUCCESS;
+}
+static int mock_tcpm_release(int port)
+{
+	return EC_SUCCESS;
+}
 
 static int mock_tcpm_select_rp_value(int port, int rp)
 {
 	return EC_SUCCESS;
 }
 
-static int mock_tcpm_set_cc(int port, int pull) { return EC_SUCCESS; }
+static int mock_tcpm_set_cc(int port, int pull)
+{
+	return EC_SUCCESS;
+}
 static int mock_tcpm_set_polarity(int port, enum tcpc_cc_polarity polarity)
 {
 	return EC_SUCCESS;
@@ -41,16 +49,28 @@ static __maybe_unused int mock_tcpm_sop_prime_enable(int port, bool enable)
 	return EC_SUCCESS;
 }
 
-static int mock_tcpm_set_vconn(int port, int enable) { return EC_SUCCESS; }
-static int mock_tcpm_set_msg_header(int port,
-			int power_role, int data_role) { return EC_SUCCESS; }
-static int mock_tcpm_set_rx_enable(int port, int enable) { return EC_SUCCESS; }
+static int mock_tcpm_set_vconn(int port, int enable)
+{
+	return EC_SUCCESS;
+}
+static int mock_tcpm_set_msg_header(int port, int power_role, int data_role)
+{
+	return EC_SUCCESS;
+}
+static int mock_tcpm_set_rx_enable(int port, int enable)
+{
+	return EC_SUCCESS;
+}
 static int mock_tcpm_transmit(int port, enum tcpci_msg_type type,
-		uint16_t header, const uint32_t *data)
-{ return EC_SUCCESS; }
-static void mock_tcpc_alert(int port) {}
+			      uint16_t header, const uint32_t *data)
+{
+	return EC_SUCCESS;
+}
+static void mock_tcpc_alert(int port)
+{
+}
 static int mock_tcpci_get_chip_info(int port, int live,
-		struct ec_response_pd_chip_info_v1 *info)
+				    struct ec_response_pd_chip_info_v1 *info)
 {
 	return EC_ERROR_UNIMPLEMENTED;
 }
@@ -76,7 +96,7 @@ struct tcpc_state {
 static struct tcpc_state mock_tcpc_state[CONFIG_USB_PD_PORT_MAX_COUNT];
 
 static int mock_tcpm_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
-	enum tcpc_cc_voltage_status *cc2)
+			    enum tcpc_cc_voltage_status *cc2)
 {
 	*cc1 = mock_tcpc_state[port].cc1;
 	*cc2 = mock_tcpc_state[port].cc2;
@@ -125,31 +145,33 @@ int tcpm_enqueue_message(const int port)
 	return EC_SUCCESS;
 }
 
-void tcpm_clear_pending_messages(int port) {}
+void tcpm_clear_pending_messages(int port)
+{
+}
 
 static const struct tcpm_drv mock_tcpm_drv = {
-	.init                   = &mock_tcpm_init,
-	.release                = &mock_tcpm_release,
-	.get_cc                 = &mock_tcpm_get_cc,
+	.init = &mock_tcpm_init,
+	.release = &mock_tcpm_release,
+	.get_cc = &mock_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.check_vbus_level       = &mock_tcpm_check_vbus_level,
+	.check_vbus_level = &mock_tcpm_check_vbus_level,
 #endif
-	.select_rp_value        = &mock_tcpm_select_rp_value,
-	.set_cc                 = &mock_tcpm_set_cc,
-	.set_polarity           = &mock_tcpm_set_polarity,
+	.select_rp_value = &mock_tcpm_select_rp_value,
+	.set_cc = &mock_tcpm_set_cc,
+	.set_polarity = &mock_tcpm_set_polarity,
 #ifdef CONFIG_USB_PD_DECODE_SOP
-	.sop_prime_enable		= &mock_tcpm_sop_prime_enable,
+	.sop_prime_enable = &mock_tcpm_sop_prime_enable,
 #endif
-	.set_vconn              = &mock_tcpm_set_vconn,
-	.set_msg_header         = &mock_tcpm_set_msg_header,
-	.set_rx_enable          = &mock_tcpm_set_rx_enable,
+	.set_vconn = &mock_tcpm_set_vconn,
+	.set_msg_header = &mock_tcpm_set_msg_header,
+	.set_rx_enable = &mock_tcpm_set_rx_enable,
 	/* The core calls tcpm_dequeue_message. */
-	.get_message_raw        = NULL,
-	.transmit               = &mock_tcpm_transmit,
-	.tcpc_alert             = &mock_tcpc_alert,
-	.get_chip_info          = &mock_tcpci_get_chip_info,
+	.get_message_raw = NULL,
+	.transmit = &mock_tcpm_transmit,
+	.tcpc_alert = &mock_tcpc_alert,
+	.get_chip_info = &mock_tcpci_get_chip_info,
 #ifdef CONFIG_USB_PD_TCPC_LOW_POWER
-	.enter_low_power_mode   = &mock_enter_low_power_mode,
+	.enter_low_power_mode = &mock_enter_low_power_mode,
 #endif
 };
 
@@ -170,7 +192,7 @@ enum tcpc_cc_voltage_status next_cc1, next_cc2;
 #define MAX_MESSAGES 8
 static struct message messages[MAX_MESSAGES];
 
-void run_test(int argc, char **argv)
+void run_test(int argc, const char **argv)
 {
 	uint8_t port = PORT0;
 	int i;
@@ -181,8 +203,8 @@ void run_test(int argc, char **argv)
 	while (1) {
 		task_wait_event_mask(TASK_EVENT_FUZZ, -1);
 
-		memset(&mock_tcpc_state[port],
-			0, sizeof(mock_tcpc_state[port]));
+		memset(&mock_tcpc_state[port], 0,
+		       sizeof(mock_tcpc_state[port]));
 
 		task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_TCPC_RESET);
 		task_wait_event(250 * MSEC);
@@ -196,7 +218,7 @@ void run_test(int argc, char **argv)
 		/* Fake RX messages, one by one. */
 		for (i = 0; i < MAX_MESSAGES && messages[i].cnt; i++) {
 			memcpy(&mock_tcpc_state[port].message, &messages[i],
-				sizeof(messages[i]));
+			       sizeof(messages[i]));
 
 			tcpm_enqueue_message(port);
 			task_wait_event(50 * MSEC);
@@ -220,21 +242,23 @@ int test_fuzz_one_input(const uint8_t *data, unsigned int size)
 
 	next_cc1 = data[0] & 0x0f;
 	next_cc2 = (data[0] & 0xf0) >> 4;
-	data++; size--;
+	data++;
+	size--;
 
 	memset(messages, 0, sizeof(messages));
 
 	for (i = 0; i < MAX_MESSAGES && size > 0; i++) {
 		int cnt = data[0];
 
-		if (cnt < 3 || cnt > MAX_TCPC_PAYLOAD+3 || cnt > size) {
+		if (cnt < 3 || cnt > MAX_TCPC_PAYLOAD + 3 || cnt > size) {
 			/* Invalid count, or out of bounds. */
 			return 0;
 		}
 
 		memcpy(&messages[i], data, cnt);
 
-		data += cnt; size -= cnt;
+		data += cnt;
+		size -= cnt;
 	}
 
 	if (size != 0) {