From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 26 May 2011 16:33:17 +0000 (+0200)
Subject: more updates for ECDSA ciphersuites.
X-Git-Tag: gnutls_2_99_2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2571136136784dfbfc1c4f93eddcb35ca8e045e;p=thirdparty%2Fgnutls.git

more updates for ECDSA ciphersuites.
---

diff --git a/lib/algorithms/publickey.c b/lib/algorithms/publickey.c
index ce48f9f013..5018f779b2 100644
--- a/lib/algorithms/publickey.c
+++ b/lib/algorithms/publickey.c
@@ -53,6 +53,7 @@ static const gnutls_pk_map pk_mappings[] = {
   {GNUTLS_KX_DHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
   {GNUTLS_KX_SRP_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
   {GNUTLS_KX_ECDHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
+  {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_PK_ECC, CIPHER_SIGN},
   {GNUTLS_KX_DHE_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
   {GNUTLS_KX_SRP_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
   {0, 0, 0}
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 88d53eaa46..0bd76afdb1 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -133,6 +133,7 @@ _gnutls_handshake_sign_data (gnutls_session_t session, gnutls_pcert_st* cert,
         }
       break;
     case GNUTLS_PK_DSA:
+    case GNUTLS_PK_ECC:
       _gnutls_hash_deinit (&td_sha, concat);
 
       if ((hash_algo != GNUTLS_DIG_SHA1) && (hash_algo != GNUTLS_DIG_SHA224)