From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 26 May 2011 15:47:11 +0000 (+0200)
Subject: Changes to allow ECDH-DSA with client mode certificates.
X-Git-Tag: gnutls_2_99_2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8697eeefc3a887671323974687b9db52e9075c19;p=thirdparty%2Fgnutls.git

Changes to allow ECDH-DSA with client mode certificates.
---

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 7769b7839a..227036d744 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -1197,7 +1197,7 @@ gnutls_pubkey_get_verify_algorithm (gnutls_pubkey_t key,
 int _gnutls_pubkey_compatible_with_sig(gnutls_pubkey_t pubkey, gnutls_protocol_t ver, 
   gnutls_sign_algorithm_t sign)
 {
-  if (pubkey->pk_algorithm == GNUTLS_PK_DSA || pubkey->pk_algorithm == GNUTLS_PK_ECC)
+  if (pubkey->pk_algorithm == GNUTLS_PK_DSA)
     { /* override */
       int hash_algo = _gnutls_dsa_q_to_hash (pubkey->pk_algorithm, &pubkey->params);
 
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 4331165998..88d53eaa46 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -724,6 +724,7 @@ _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
       dconcat.size = 36;
       break;
     case GNUTLS_PK_DSA:
+    case GNUTLS_PK_ECC:
 
       dconcat.data = &concat[16];
       dconcat.size = 20;