From 2c12e7f6f5869e37df2d1f1f74a94e082965ec24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Wed, 25 Apr 2007 07:58:32 +0000 Subject: [PATCH] Ensure that AES remains the preferred cipher at any given key length. (This does not really require a special case for Camellia.) --- doc/apps/ciphers.pod | 3 +-- ssl/ssl.h | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod index acafdb105e..694e433ef3 100644 --- a/doc/apps/ciphers.pod +++ b/doc/apps/ciphers.pod @@ -105,8 +105,7 @@ The following is a list of all permitted cipher strings and their meanings. =item B the default cipher list. This is determined at compile time and is normally -B or -B. This must be the first cipher string +B. This must be the first cipher string specified. =item B 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 -- 2.34.1