commit e1b1a2c9798c2ab761d82cf5c915e16a6c0db06c
author Jaeden Amero <jaeden.amero@arm.com> Thu Dec 06 16:11:49 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Thu Dec 06 16:11:49 2018 +0000
tree 5824f742ff69a3d5811b899a611d4406ce63e26d
parent 9055a7d855eaea59c5ee02d174efe183113cc04d
parent f6d6e3082077fea70b5559a60994c1f847172211

Merge remote-tracking branch 'upstream-public/pr/2181' into development

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c64036c..38690fa 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3201,8 +3201,10 @@
         }
     }
 
-    if( ssl->out_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE &&
-        hs_type != MBEDTLS_SSL_HS_HELLO_REQUEST &&
+    /* Whenever we send anything different from a
+     * HelloRequest we should be in a handshake - double check. */
+    if( ! ( ssl->out_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE &&
+            hs_type          == MBEDTLS_SSL_HS_HELLO_REQUEST ) &&
         ssl->handshake == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
@@ -3296,8 +3298,8 @@
     /* Either send now, or just save to be sent (and resent) later */
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
     if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM &&
-        ( ssl->out_msgtype != MBEDTLS_SSL_MSG_HANDSHAKE ||
-          hs_type != MBEDTLS_SSL_HS_HELLO_REQUEST ) )
+        ! ( ssl->out_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE &&
+            hs_type          == MBEDTLS_SSL_HS_HELLO_REQUEST ) )
     {
         if( ( ret = ssl_flight_append( ssl ) ) != 0 )
         {