commit d5f7d24e849b2a7f04a872c0d90d47e6020fcf81
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Mar 13 00:08:05 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Mar 13 00:08:05 2018 +0100
tree 74f948ced6bc90e0969bf41fb3bac4bb188bdd96
parent a31d8206b1277956905b679400aeab27c748c351
parent 3ff4a074af5f188c4d7c8ab1ae57bd1d50dd11d6

Merge branch 'pr_1064' into development-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ed2165e..a37282b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
      overflow. #1179
    * Fix memory allocation corner cases in memory_buffer_alloc.c module. Found
      by Guido Vranken. #639
+   * Log correct number of ciphersuites used in Client Hello message. #918
 
 Changes
    * Fix tag lengths and value ranges in the documentation of CCM encryption.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 2534346..5367fdd 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -902,6 +902,8 @@
         *p++ = (unsigned char)( ciphersuites[i]      );
     }
 
+    MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, got %d ciphersuites (excluding SCSVs)", n ) );
+
     /*
      * Add TLS_EMPTY_RENEGOTIATION_INFO_SCSV
      */
@@ -909,6 +911,7 @@
     if( ssl->renego_status == MBEDTLS_SSL_INITIAL_HANDSHAKE )
 #endif
     {
+        MBEDTLS_SSL_DEBUG_MSG( 3, ( "adding EMPTY_RENEGOTIATION_INFO_SCSV" ) );
         *p++ = (unsigned char)( MBEDTLS_SSL_EMPTY_RENEGOTIATION_INFO >> 8 );
         *p++ = (unsigned char)( MBEDTLS_SSL_EMPTY_RENEGOTIATION_INFO      );
         n++;
@@ -928,8 +931,6 @@
     *q++ = (unsigned char)( n >> 7 );
     *q++ = (unsigned char)( n << 1 );
 
-    MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, got %d ciphersuites", n ) );
-
 #if defined(MBEDTLS_ZLIB_SUPPORT)
     offer_compress = 1;
 #else