commit 3c599f11b03a5bec57187b92f3dcef9ab15f91b5
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 10 13:25:07 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Mar 13 19:25:06 2014 +0100
tree 52baea25a0a1cd2df13c0807525e3fb948445b1f
parent 9533765b252ed3f86adba4152c8900a86933ce96

Avoid possible segfault on bad server ciphersuite

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 4e42c0b..b509e37 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -867,15 +867,15 @@
      * Initialize update checksum functions
      */
     ssl->transform_negotiate->ciphersuite_info = ssl_ciphersuite_from_id( i );
-    ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
 
     if( ssl->transform_negotiate->ciphersuite_info == NULL )
     {
-        SSL_DEBUG_MSG( 1, ( "ciphersuite info for %02x not found",
-                          ssl->ciphersuite_list[ssl->minor_ver][i] ) );
+        SSL_DEBUG_MSG( 1, ( "ciphersuite info for %04x not found", i ) );
         return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
     }
 
+    ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
+
     SSL_DEBUG_MSG( 3, ( "server hello, session id len.: %d", n ) );
     SSL_DEBUG_BUF( 3,   "server hello, session id", buf + 39, n );