generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that AES remains the preferred cipher at any given key length.

Browse Source 
(This does not really require a special case for Camellia.)
This commit is contained in:
Bodo Möller 2007-04-25 07:58:32 +00:00
parent 8db10d9ac4
commit 2c12e7f6f5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/apps/ciphers.pod
View File

@ -105,8 +105,7 @@ The following is a list of all permitted cipher strings and their meanings.
=item B<DEFAULT> =item B<DEFAULT>
the default cipher list. This is determined at compile time and is normally the default cipher list. This is determined at compile time and is normally
B<ALL:!aNULL:!eNULL:+RC4:@STRENGTH> or B<AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH>. This must be the first cipher string
B<AES:CAMELLIA:ALL!aNULL:!eNULL:+RC4:@STRENGTH>. This must be the first cipher string
specified. specified.
=item B<COMPLEMENTOFDEFAULT> =item B<COMPLEMENTOFDEFAULT>

6
ssl/ssl.h
View File

@ -317,11 +317,7 @@ extern "C" {
/* The following cipher list is used by default. /* The following cipher list is used by default.
* It also is substituted when an application-defined cipher list string * It also is substituted when an application-defined cipher list string
* starts with 'DEFAULT'. */ * starts with 'DEFAULT'. */
#ifdef OPENSSL_NO_CAMELLIA #define SSL_DEFAULT_CIPHER_LIST "AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low priority for RC4 */
# 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
/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */ /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
#define SSL_SENT_SHUTDOWN 1 #define SSL_SENT_SHUTDOWN 1