Put ECCdraft ciphersuites back into default build (but disabled

unless specifically requested)
2006-06-22 12:35:54 +00:00
parent 35908bd040
commit aa17ab7e57
3 changed files with 23 additions and 7 deletions
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1165,7 +1165,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	},
 #endif /* OPENSSL_NO_CAMELLIA */

-#if 0 /* please use OpenSSL 0.9.9 branch for ECC ciphersuites */
 #ifndef OPENSSL_NO_ECDH
 	/* Cipher C001 */
 	    {
@@ -1517,7 +1516,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
            SSL_ALL_STRENGTHS,
            },
 #endif	/* OPENSSL_NO_ECDH */
-#endif


 /* end of list */