summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-05-26 17:47:11 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-05-26 17:47:11 +0200
commit8697eeefc3a887671323974687b9db52e9075c19 (patch)
treefaed98b3f4e1ffcef5efc99b7527f06fb60f18a3
parent8207ff6d95b3f658c237d2aa004a97ef213b583a (diff)
downloadgnutls-8697eeefc3a887671323974687b9db52e9075c19.tar.gz
Changes to allow ECDH-DSA with client mode certificates.
-rw-r--r--lib/gnutls_pubkey.c2
-rw-r--r--lib/gnutls_sig.c1
2 files changed, 2 insertions, 1 deletions
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;