projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bbfcc47
)
remove inconsistency between builds with and without Camellia enabled
author
Bodo Möller
<bodo@openssl.org>
Mon, 19 Feb 2007 17:55:07 +0000
(17:55 +0000)
committer
Bodo Möller
<bodo@openssl.org>
Mon, 19 Feb 2007 17:55:07 +0000
(17:55 +0000)
ssl/ssl.h
patch
|
blob
|
history
diff --git
a/ssl/ssl.h
b/ssl/ssl.h
index dc9c3cdf16de5f2bdf8c1154b8a013b66b24e9f4..2e067e7a78e468909984ffc12c6eabd50b1e22d4 100644
(file)
--- a/
ssl/ssl.h
+++ b/
ssl/ssl.h
@@
-319,7
+319,7
@@
extern "C" {
#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 */
+# define SSL_DEFAULT_CIPHER_LIST "AES:CAMELLIA:ALL:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */
#endif
/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */