From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 12 Oct 2007 20:25:34 +0000 (+0300)
Subject: The 256 bit ciphers are not enabled in the default priorities.
X-Git-Tag: gnutls_2_1_2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f0ea1cb8a2975cd55cf7d36498df7202b616a1a;p=thirdparty%2Fgnutls.git

The 256 bit ciphers are not enabled in the default priorities.
---

diff --git a/NEWS b/NEWS
index ce78e92bfa..037eac5b15 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ See the end for copying conditions.
 
 * Version 2.1.2 (unreleased)
 
+** The 256 bit ciphers are not enabled in the default priorities.
+
+** Added support for DSA2 using libgcrypt 1.3.0.
+
 ** certtool: Fixed data corruption when using --outder.
 
 ** Removed all the xml related stubs and functions.
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 0f5c016f62..a6ad012a03 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -263,7 +263,7 @@ gnutls_certificate_type_set_priority (gnutls_session_t session,
   * Protocols: TLS 1.2, TLS 1.1, TLS 1.0, and SSL3.
   * Key exchange algorithm: DHE-PSK, PSK, SRP-RSA, SRP-DSS, SRP,
   * DHE-RSA, DHE-DSS, RSA.
-  * Cipher: AES_256_CBC, AES_128_CBC, 3DES_CBC, CAMELLIA_256_CBC, CAMELLIA_128_CBC, 
+  * Cipher: AES_128_CBC, 3DES_CBC, CAMELLIA_128_CBC, 
   * and ARCFOUR_128.
   * MAC algorithm: SHA, and MD5.
   * Certificate types: X.509, OpenPGP
@@ -297,11 +297,9 @@ gnutls_set_default_priority (gnutls_session_t session)
     0
   };
   static const int cipher_priority[] = {
-    GNUTLS_CIPHER_AES_256_CBC,
     GNUTLS_CIPHER_AES_128_CBC,
     GNUTLS_CIPHER_3DES_CBC,
 #ifdef	ENABLE_CAMELLIA
-    GNUTLS_CIPHER_CAMELLIA_256_CBC,
     GNUTLS_CIPHER_CAMELLIA_128_CBC,
 #endif
     GNUTLS_CIPHER_ARCFOUR_128,
@@ -345,7 +343,7 @@ gnutls_set_default_priority (gnutls_session_t session)
   * The order is TLS1, SSL3 for protocols,  RSA, DHE_DSS, 
   * DHE_RSA, RSA_EXPORT for key exchange algorithms.
   * SHA, MD5, RIPEMD160 for MAC algorithms,
-  * AES_256_CBC, AES_128_CBC, 3DES_CBC, CAMELLIA_256_CBC, CAMELLIA_128_CBC, 
+  * AES_128_CBC, 3DES_CBC, CAMELLIA_128_CBC, 
   * ARCFOUR_128, ARCFOUR_40 for ciphers.
   *
   * Returns 0 on success.
@@ -362,11 +360,9 @@ gnutls_set_default_export_priority (gnutls_session_t session)
     GNUTLS_KX_RSA_EXPORT, 0
   };
   static const int cipher_priority[] = {
-    GNUTLS_CIPHER_AES_256_CBC,
     GNUTLS_CIPHER_AES_128_CBC,
     GNUTLS_CIPHER_3DES_CBC,
 #ifdef	ENABLE_CAMELLIA
-    GNUTLS_CIPHER_CAMELLIA_256_CBC,
     GNUTLS_CIPHER_CAMELLIA_128_CBC,
 #endif
     GNUTLS_CIPHER_ARCFOUR_128,