summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2007-04-25 07:58:32 +0000
committerBodo Möller <bodo@openssl.org>2007-04-25 07:58:32 +0000
commit2c12e7f6f5869e37df2d1f1f74a94e082965ec24 (patch)
treeb38e9683874d3303ff15984e1d10d76bec16e8fe /ssl/ssl.h
parent8db10d9ac4c920a22cbe8ab36d16e1f1503f3ca6 (diff)
Ensure that AES remains the preferred cipher at any given key length.
(This does not really require a special case for Camellia.)
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 2b896978f5..ff18cf5fd3 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -317,11 +317,7 @@ extern "C" {
/* The following cipher list is used by default.
* It also is substituted when an application-defined cipher list string
* starts with 'DEFAULT'. */
-#ifdef OPENSSL_NO_CAMELLIA
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low priority for RC4 */
-#else
-# define SSL_DEFAULT_CIPHER_LIST "AES:CAMELLIA:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low priority for RC4 */
-#endif
+#define SSL_DEFAULT_CIPHER_LIST "AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low priority for RC4 */
/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
#define SSL_SENT_SHUTDOWN 1