diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-06-14 13:52:49 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-06-14 13:52:49 +0000 |
| commit | b610f46baea62ea01bc6c36470fb9f15b19ce334 (patch) | |
| tree | 0f020fc14776fef70e318d1c947f75cf53ad8422 /ssl/ssl.h | |
| parent | 1921a1adb248c8f9bd0dc73474abd96fb140cfca (diff) | |
Make sure that AES ciphersuites get priority over Camellia ciphersuites
in the default cipher string.
Diffstat (limited to 'ssl/ssl.h')
| -rw-r--r-- | ssl/ssl.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -109,7 +109,7 @@ * */ /* ==================================================================== - * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -316,7 +316,11 @@ extern "C" { /* The following cipher list is used by default. * It also is substituted when an application-defined cipher list string * starts with 'DEFAULT'. */ -#define SSL_DEFAULT_CIPHER_LIST "ALL:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */ +#ifdef OPENSSL_NO_CAMELLIA +# define SSL_DEFAULT_CIPHER_LIST "ALL:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */ +#else +# define SSL_DEFAULT_CIPHER_LIST "AES:CAMELLIA:-ECCdraft:ALL:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */ +#endif /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */ #define SSL_SENT_SHUTDOWN 1 |