commit 5a29990367a863c0879efbfdf63ab9e286cef8fe
author Hanno Becker <hanno.becker@arm.com> Fri May 03 12:47:49 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Mon Jun 03 14:43:16 2019 +0100
tree 4a5b6e2a27177db61213fe66aa0ab3b91ec8e1e6
parent 2262648b6968f4dee34f4437dbfb9f30cdc0de45

Improve structure of client-side CID extension parsing

Group configuring CID values together.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 1063f45..45f4c40 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1340,14 +1340,13 @@
         return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
     }
 
+    ssl->handshake->cid_in_use = MBEDTLS_SSL_CID_ENABLED;
     ssl->handshake->peer_cid_len = (uint8_t) peer_cid_len;
     memcpy( ssl->handshake->peer_cid, buf, peer_cid_len );
 
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "Use of CID extension negotiated" ) );
     MBEDTLS_SSL_DEBUG_BUF( 3, "Server CID", buf, peer_cid_len );
 
-    ssl->handshake->cid_in_use = MBEDTLS_SSL_CID_ENABLED;
-
     return( 0 );
 }
 #endif /* MBEDTLS_SSL_CID */