commit 49f179d9c856539b5b0a2aed19595684bb4f80bf
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Mar 07 15:09:32 2025 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Apr 01 10:39:04 2025 +0200
tree 945ed7a678c7cd0898e2740b59549f5f31344378
parent 36234141132554e751c1f70e17f4915fa4a4f648

Always call mbedtls_ssl_handshake_set_state

Call a single function for all handshake state changes, for easier tracing.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 4adaf7d..2bea154 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -5318,7 +5318,7 @@
     ssl->out_msglen  = 1;
     ssl->out_msg[0]  = 1;
 
-    ssl->state++;
+    mbedtls_ssl_handshake_increment_state(ssl);
 
     if ((ret = mbedtls_ssl_write_handshake_msg(ssl)) != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_ssl_write_handshake_msg", ret);
@@ -5380,7 +5380,7 @@
 
     mbedtls_ssl_update_in_pointers(ssl);
 
-    ssl->state++;
+    mbedtls_ssl_handshake_increment_state(ssl);
 
     MBEDTLS_SSL_DEBUG_MSG(2, ("<= parse change cipher spec"));