Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: Id9e135fd35f61816fa4d04bffaa6308da388b687
Change-Id: I7a92b7a544f772eef77b429aaeefd28cba6b8367
diff --git a/nugget/include/app_nugget.h b/nugget/include/app_nugget.h
index f713299..cd8bf33 100644
--- a/nugget/include/app_nugget.h
+++ b/nugget/include/app_nugget.h
@@ -521,7 +521,7 @@
  * nonce || gsa_psk_state)
  */
 struct verify_psk_request {
-    char header[VERIFY_PSK_REQ_HEADER_SIZE];
+    uint8_t header[VERIFY_PSK_REQ_HEADER_SIZE];
     uint8_t version;
     uint8_t nonce[VERIFY_PSK_NONCE_SIZE];
     uint8_t gsa_psk_state;
@@ -540,11 +540,31 @@
  * Verify GSA GSC pre-shared key command
  *
  * @param args         struct verify_psk_request
- * @param arg_len      63 bytes
+ * @param arg_len      83 bytes
  * @param reply        psk verification result
  * @param reply_len    1 bytes
  */
 
+#define NUGGET_PARAM_SECURE_TRANSPORT_HANDSHAKE 0x0019
+/*
+ * Secure transport handshak (noise protocol) command
+ *
+ * @param args         GSA EC public_key + AES_GCM256("MSGA") + AES_GSC_TAG
+ * @param arg_len      64 + 4 + 16 bytes = 84
+ * @param reply        GSC EC public_key + AES_GCM256("MSGB") + AES_GSC_TAG OR 1 byte error state
+ * @param reply_len    64 + 4 + 16 bytes = 84 OR 1
+ */
+
+#define NUGGET_PARAM_SECURE_TRANSPORT_REPORT_STATE 0x001a
+/*
+ * Secure transport report noise handshake state command
+ *
+ * @param args         GSA noise handshake state
+ * @param arg_len      1
+ * @param reply        <none>
+ * @param reply_len    0
+ */
+
 /****************************************************************************/
 /* Test related commands */
 
diff --git a/nugget/include/app_transport_test.h b/nugget/include/app_transport_test.h
index 0c0b4ba..821ebb8 100644
--- a/nugget/include/app_transport_test.h
+++ b/nugget/include/app_transport_test.h
@@ -21,5 +21,6 @@
 #define TRANSPORT_TEST_1234 8    /* Returns 0x01020304 successfully */
 #define TRANSPORT_TEST_9876 9    /* Only successful if the arg is 0x09080706 */
 #define TRANSPORT_TEST_HANG 12   /* Forgets to call app_reply() */
+#define TRANSPORT_TEST_ECHO_2 13 /* Echoes back 2 bytes received by host */
 
 #endif /* __CROS_EC_INCLUDE_APP_TRANSPORT_TEST_H */