commit 7b1921ac571ad3eb2f2b552b8d07896c8e6e2a7d
author Ronald Cron <ronald.cron@arm.com> Thu Nov 23 12:31:56 2023 +0100
committer Ronald Cron <ronald.cron@arm.com> Mon Jan 15 08:58:19 2024 +0100
tree 75a192979a527e5bbfa1c922b16086ed17af02ed
parent 17ef8dfddb998a7eab9de8cdfd0ff5c3b6e069fa

Add endpoint in TLS 1.2 session serialization data

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8c1e372..9fabda4 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8942,6 +8942,7 @@
  *
  * struct {
  *    uint64 start_time;
+ *    uint8 endpoint;
  *    uint8 ciphersuite[2];           // defined by the standard
  *    uint8 session_id_len;           // at most 32
  *    opaque session_id[32];
@@ -8988,13 +8989,15 @@
     /*
      * Basic mandatory fields
      */
-    used += 2   /* ciphersuite */
+    used += 1   /* endpoint */
+            + 2 /* ciphersuite */
             + 1 /* id_len */
             + sizeof(session->id)
             + sizeof(session->master)
             + 4; /* verify_result */
 
     if (used <= buf_len) {
+        *p++ = session->endpoint;
         MBEDTLS_PUT_UINT16_BE(session->ciphersuite, p, 0);
         p += 2;
 
@@ -9129,10 +9132,11 @@
     /*
      * Basic mandatory fields
      */
-    if (2 + 1 + 32 + 48 + 4 > (size_t) (end - p)) {
+    if (1 + 2 + 1 + 32 + 48 + 4 > (size_t) (end - p)) {
         return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
     }
 
+    session->endpoint = *p++;
     session->ciphersuite = MBEDTLS_GET_UINT16_BE(p, 0);
     p += 2;