commit 5de2580563109decf0e883f7e7c414b933d35333
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Feb 03 15:56:49 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Feb 06 10:28:38 2014 +0100
tree 7d9cdc5babe9af2eb9a39af8dcb4611fbe83d3bf
parent 987bfb510bb84c893a67b134564109cbe4615af5

Make ssl_set_ecdh_curves() a compile-time option

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index dfae8c5..ac5f802 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2105,7 +2105,8 @@
          *     ECPoint      public;
          * } ServerECDHParams;
          */
-
+        ecp_group_id grp_id;
+#if defined(POLARSSL_SSL_SET_ECDH_CURVES)
         unsigned int pref_idx, curv_idx, found;
 
         /* Match our preference list against the agreed curves */
@@ -2137,9 +2138,13 @@
          * ssl->ecdh_curve_list[pref_idx] will contain POLARSSL_ECP_DP_NONE and
          * ecp_use_known_dp() will fail.
          */
+        grp_id = ssl->ecdh_curve_list[pref_idx];
+#else
+        grp_id = ssl->handshake->curves[0]->grp_id;
+#endif /* POLARSSL_SSL_SET_ECDH_CURVES */
 
         if( ( ret = ecp_use_known_dp( &ssl->handshake->ecdh_ctx.grp,
-                                       ssl->ecdh_curve_list[pref_idx] ) ) != 0 )
+                                       grp_id ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "ecp_use_known_dp", ret );
             return( ret );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 02f24a1..29977d7 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3424,7 +3424,8 @@
     ssl->ticket_lifetime = SSL_DEFAULT_TICKET_LIFETIME;
 #endif
 
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED)
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
+    defined(POLARSSL_SSL_SET_ECDH_CURVES)
     ssl->ecdh_curve_list = ecdh_default_curve_list;
 #endif
 
@@ -4655,7 +4656,8 @@
 
 #endif
 
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED)
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
+    defined(POLARSSL_SSL_SET_ECDH_CURVES)
 /*
  * Set the allowed ECDH curves.
  */