diff options
| author | Tommy Chiu <tommychiu@google.com> | 2022-07-20 12:49:45 +0800 |
|---|---|---|
| committer | Tommy Chiu <tommychiu@google.com> | 2022-07-20 07:03:38 +0000 |
| commit | 263a13fc6a4ba61714578cae645f6abea73f6b43 (patch) | |
| tree | e2ca3f43ecf503188781a45d2817d0c82ef64349 | |
| parent | d5583c363610ddacfde79eb2d77946a21ae43a8c (diff) | |
| download | generic-263a13fc6a4ba61714578cae645f6abea73f6b43.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into D2-TM-011
* goog/upstream-master:
nugget: Add support noise handshake state report
secure_transport: Add support secure transport handshake cmd
Bug: 228796951
Bug: 228796951
Test: QMC
Change-Id: Icc5274c3453e79185c2bf9ef71fe8483b889110a
| -rw-r--r-- | nugget/include/app_nugget.h | 24 |
1 files changed, 22 insertions, 2 deletions
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 @@ enum gsa_gsc_psk_state { * 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 @@ struct secure_channel_retry_count_persist_storage { * 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 */ |