summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2007-10-15 01:05:12 +0300
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2007-10-15 01:05:12 +0300
commit20d4f2081ce74e71393399007f89f75a3999b8a5 (patch)
treed3b68c71d3831b9e5099a8fad3c06f74a401ef61
parent3512501e6dc6717a3bb70ba878dd892b253e2dcd (diff)
downloadgnutls-20d4f2081ce74e71393399007f89f75a3999b8a5.tar.gz
Reenabled the 256 bit algorithms in the default priorities.
-rw-r--r--lib/gnutls_priority.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index a6ad012a03..ab76cca865 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_128_CBC, 3DES_CBC, CAMELLIA_128_CBC,
+ * Cipher: AES_256_CBC, AES_128_CBC, 3DES_CBC, CAMELLIA_128_CBC,
* and ARCFOUR_128.
* MAC algorithm: SHA, and MD5.
* Certificate types: X.509, OpenPGP
@@ -297,6 +297,7 @@ 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
@@ -343,7 +344,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_128_CBC, 3DES_CBC, CAMELLIA_128_CBC,
+ * AES_256_CBC, AES_128_CBC, 3DES_CBC, CAMELLIA_128_CBC,
* ARCFOUR_128, ARCFOUR_40 for ciphers.
*
* Returns 0 on success.
@@ -360,6 +361,7 @@ 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