commit b349fd74fb879e775c1e3f9455f2bd801834ecaa
author Tommy Chiu <tommychiu@google.com> Fri Jul 22 18:34:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 22 18:34:31 2022 +0000
tree e2ca3f43ecf503188781a45d2817d0c82ef64349
parent 24bcdd3bdb1a081de0ece46ac94299603ab026e8
parent 65c155ae44db482797cd3aefed516e343a6cd064

Merge remote-tracking branch 'goog/upstream-master' into D2-TM-011 am: 263a13fc6a am: 65c155ae44

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/19354390

Change-Id: I951eae5f1310b5907f76b37816c1de5c04ab08c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

nugget/include/app_nugget.h

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 */