From: Bodo Möller <bodo@openssl.org>
Date: Mon, 19 Feb 2007 17:55:07 +0000 (+0000)
Subject: remove inconsistency between builds with and without Camellia enabled
X-Git-Tag: OpenSSL_0_9_8e~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2710ee19abc5d983e2d8479b81276b65a8daa4f;p=oweals%2Fopenssl.git

remove inconsistency between builds with and without Camellia enabled
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index dc9c3cdf16..2e067e7a78 100644
--- 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(); */