commit 6bce9cb5acbbdc56877e34126253703fdf744d20
author Andres Amaya Garcia <andres.amayagarcia@arm.com> Wed Sep 06 15:33:34 2017 +0100
committer Simon Butcher <simon.butcher@arm.com> Fri Oct 06 11:59:13 2017 +0100
tree b1621c39252a27c4f63d1630794034c38ae419b0
parent 470edd031fce0aed8303d7add0f48c3c5abf9177

Always print gmt_unix_time in TLS client

Change ssl_parse_server_hello() so that the parsed first four random
bytes from the ServerHello message are printed by the TLS client as
a Unix timestamp regardless of whether MBEDTLS_DEBUG_C is defined. The
debug message will only be printed if debug_level is 3 or higher.

Unconditionally enabling the debug print enabled testing of this value.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 19bf021..544c8cf 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1448,9 +1448,6 @@
 #endif
     int handshake_failure = 0;
     const mbedtls_ssl_ciphersuite_t *suite_info;
-#if defined(MBEDTLS_DEBUG_C)
-    uint32_t t;
-#endif
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse server hello" ) );
 
@@ -1553,13 +1550,11 @@
         return( MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION );
     }
 
-#if defined(MBEDTLS_DEBUG_C)
-    t = ( (uint32_t) buf[2] << 24 )
-      | ( (uint32_t) buf[3] << 16 )
-      | ( (uint32_t) buf[4] <<  8 )
-      | ( (uint32_t) buf[5]       );
-    MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, current time: %lu", t ) );
-#endif
+    MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, current time: %lu",
+                           ( (uint32_t) buf[2] << 24 ) |
+                           ( (uint32_t) buf[3] << 16 ) |
+                           ( (uint32_t) buf[4] <<  8 ) |
+                           ( (uint32_t) buf[5]       ) ) );
 
     memcpy( ssl->handshake->randbytes + 32, buf + 2, 32 );