commit 0de0d863b615ca292f2eaed4a7db1b321bcf20d4
author Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 06:04:50 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 07:41:42 2023 +0000
tree d75c9538dce201cef9a8fcbfcb62caedd14eb146
parent 8dc4ce76c748bd44a059d493ef2cfcc9ef43bb95

Rebase code to restore reco-delay and fix some style issues

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index e896e82..1e79afa 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -1279,16 +1279,16 @@
          */
         ret = mbedtls_ssl_tls13_key_schedule_stage_early(ssl);
         if (ret != 0) {
-            MBEDTLS_SSL_DEBUG_RET(1,
-                                  "mbedtls_ssl_tls13_key_schedule_stage_early", ret);
+            MBEDTLS_SSL_DEBUG_RET(
+                1, "mbedtls_ssl_tls13_key_schedule_stage_early", ret);
             return ret;
         }
 
         /* Derive early data key material */
         ret = mbedtls_ssl_tls13_compute_early_transform(ssl);
         if (ret != 0) {
-            MBEDTLS_SSL_DEBUG_RET(1,
-                                  "mbedtls_ssl_tls13_compute_early_transform", ret);
+            MBEDTLS_SSL_DEBUG_RET(
+                1, "mbedtls_ssl_tls13_compute_early_transform", ret);
             return ret;
         }
 
@@ -1938,7 +1938,8 @@
     }
 #endif
 
-    if (!mbedtls_ssl_conf_tls13_check_kex_modes(ssl, handshake->key_exchange_mode)) {
+    if (!mbedtls_ssl_conf_tls13_check_kex_modes(
+            ssl, handshake->key_exchange_mode)) {
         ret = MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE;
         MBEDTLS_SSL_DEBUG_MSG(2,
                               ("Key exchange mode(%s) is not supported.",
@@ -2255,7 +2256,8 @@
     MBEDTLS_SSL_DEBUG_MSG(2, ("=> write EndOfEarlyData"));
 
     MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_start_handshake_msg(
-                             ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, &buf, &buf_len));
+                             ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA,
+                             &buf, &buf_len));
 
     mbedtls_ssl_add_hs_hdr_to_checksum(
         ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, 0);

tests/opt-testcases/tls13-misc.sh

diff --git a/tests/opt-testcases/tls13-misc.sh b/tests/opt-testcases/tls13-misc.sh
index 711b512..46c371f 100755
--- a/tests/opt-testcases/tls13-misc.sh
+++ b/tests/opt-testcases/tls13-misc.sh
@@ -274,7 +274,7 @@
                              MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
 run_test    "TLS 1.3 m->G: EarlyData: basic check, good" \
             "$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --earlydata --disable-client-cert" \
-            "$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \
+            "$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=900" \
             0 \
             -c "Reconnecting with saved session" \
             -c "NewSessionTicket: early_data(42) extension received." \