From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 28 May 2011 09:41:34 +0000 (+0200)
Subject: ECDHE and ECDSA were added to deafult priorities.
X-Git-Tag: gnutls_2_99_3~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dac646d37a23e7d34e7ccfdd32f0ecd6f8fdf54;p=thirdparty%2Fgnutls.git

ECDHE and ECDSA were added to deafult priorities.
---

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 4b3f733f4f..73138b113d 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -246,6 +246,8 @@ static const int protocol_priority[] = {
 
 static const int kx_priority_performance[] = {
   GNUTLS_KX_RSA,
+  GNUTLS_KX_ECDHE_ECDSA,
+  GNUTLS_KX_ECDHE_RSA,
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
   /* GNUTLS_KX_ANON_DH: Man-in-the-middle prone, don't add!
@@ -256,6 +258,8 @@ static const int kx_priority_performance[] = {
 
 static const int kx_priority_export[] = {
   GNUTLS_KX_RSA,
+  GNUTLS_KX_ECDHE_ECDSA,
+  GNUTLS_KX_ECDHE_RSA,
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
   GNUTLS_KX_RSA_EXPORT,
@@ -268,6 +272,8 @@ static const int kx_priority_secure[] = {
    */
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
+  GNUTLS_KX_ECDHE_ECDSA,
+  GNUTLS_KX_ECDHE_RSA,
   GNUTLS_KX_RSA,
   /* GNUTLS_KX_ANON_DH: Man-in-the-middle prone, don't add!
    * GNUTLS_KX_RSA_EXPORT: Deprecated, don't add!
@@ -360,26 +366,36 @@ static const int comp_priority[] = {
 };
 
 static const int sign_priority_default[] = {
-  GNUTLS_SIGN_DSA_SHA224,
-  GNUTLS_SIGN_DSA_SHA256,
   GNUTLS_SIGN_RSA_SHA256,
+  GNUTLS_SIGN_DSA_SHA256,
+  GNUTLS_SIGN_ECDSA_SHA256,
+
   GNUTLS_SIGN_RSA_SHA384,
+  GNUTLS_SIGN_ECDSA_SHA384,
+
   GNUTLS_SIGN_RSA_SHA512,
+  GNUTLS_SIGN_ECDSA_SHA512,
+
+  GNUTLS_SIGN_RSA_SHA224,
+  GNUTLS_SIGN_DSA_SHA224,
+  GNUTLS_SIGN_ECDSA_SHA224,
+
   GNUTLS_SIGN_RSA_SHA1,
   GNUTLS_SIGN_DSA_SHA1,
+  GNUTLS_SIGN_ECDSA_SHA1,
   0
 };
 
 static const int sign_priority_secure128[] = {
   GNUTLS_SIGN_RSA_SHA256,
-  GNUTLS_SIGN_RSA_SHA384,
-  GNUTLS_SIGN_RSA_SHA512,
-  GNUTLS_SIGN_DSA_SHA1,
+  GNUTLS_SIGN_DSA_SHA256,
+  GNUTLS_SIGN_ECDSA_SHA256,
   0
 };
 
 static const int sign_priority_secure256[] = {
   GNUTLS_SIGN_RSA_SHA512,
+  GNUTLS_SIGN_ECDSA_SHA512,
   0
 };