From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 21 May 2011 15:07:40 +0000 (+0200)
Subject: use the _gnutls_session_is_ecc() to check for ECDH.
X-Git-Tag: gnutls_2_99_2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2c4268f0fd156c5f5a67e2e2e146309af22a13;p=thirdparty%2Fgnutls.git

use the _gnutls_session_is_ecc() to check for ECDH.
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index c262f6f69c..e8393522e7 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -3348,8 +3348,7 @@ _gnutls_remove_unwanted_ciphersuites (gnutls_session_t session,
       /* If we have not agreed to a common curve with the peer don't bother
        * negotiating ECDH.
        */
-      if (session->security_parameters.entity == GNUTLS_SERVER && (kx == GNUTLS_KX_ANON_ECDH ||
-          kx == GNUTLS_KX_ECDHE_RSA))
+      if (session->security_parameters.entity == GNUTLS_SERVER && _gnutls_session_is_ecc(session))
         {
           if (_gnutls_session_ecc_curve_get(session) == GNUTLS_ECC_CURVE_INVALID)
             delete = 1;