commit 1f10d7643ffe3fc86b7a8496207ad6581778eca0
author Hanno Becker <hanno.becker@arm.com> Fri Apr 26 13:34:37 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri Apr 26 13:34:37 2019 +0100
tree e1b615942d84d705a500e14c8410745a1ac8ea23
parent 22bf14559980d5404c63b6711779e0db0bf031c7

Fix uninitialized variable access in debug output of record enc/dec

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 7c90077..da42ed7 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1965,6 +1965,8 @@
             return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
         }
 
+        ssl_extract_add_data_from_record( add_data, rec );
+
         MBEDTLS_SSL_DEBUG_BUF( 4, "IV used (internal)",
                                   iv, transform->ivlen );
         MBEDTLS_SSL_DEBUG_BUF( 4, "IV used (transmitted)",
@@ -1979,7 +1981,6 @@
          * Encrypt and authenticate
          */
 
-        ssl_extract_add_data_from_record( add_data, rec );
         if( ( ret = mbedtls_cipher_auth_encrypt( &transform->cipher_ctx_enc,
                    iv, transform->ivlen,
                    add_data, 13,                 /* add data     */
@@ -2118,12 +2119,12 @@
                 return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
             }
 
+            ssl_extract_add_data_from_record( add_data, rec );
+
             MBEDTLS_SSL_DEBUG_MSG( 3, ( "using encrypt then mac" ) );
             MBEDTLS_SSL_DEBUG_BUF( 4, "MAC'd meta-data", add_data,
                                    sizeof( add_data ) );
 
-            ssl_extract_add_data_from_record( add_data, rec );
-
             mbedtls_md_hmac_update( &transform->md_ctx_enc, add_data,
                                     sizeof( add_data ) );
             mbedtls_md_hmac_update( &transform->md_ctx_enc,