commit 3f81973a9aa83f8d0c59960e0403f5fff7faf33d
author Janos Follath <janos.follath@arm.com> Tue Mar 22 15:49:23 2016 +0000
committer Janos Follath <janos.follath@arm.com> Tue Mar 22 15:49:23 2016 +0000
tree 4a6495580448f94ca6fa0221acd66f3bd45cef24
parent 4dfecabb977ebf24d3cff66e43bc96aa21d2c077

Fix bug in ssl_write_supported_elliptic_curves_ext

Passing invalid curves to mbedtls_ssl_conf_curves caused a crash later
in ssl_write_supported_elliptic_curves_ext. #373

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index b1cd7cb..e1cebbf 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -330,6 +330,12 @@
     for( info = ecp_curve_list(); info->grp_id != POLARSSL_ECP_DP_NONE; info++ )
     {
 #endif
+        if( info == NULL )
+        {
+            SSL_DEBUG_MSG( 1, ( "invalid curve in ssl configuration" ) );
+            return;
+        }
+
         elliptic_curve_len += 2;
     }