summaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2006-06-22 12:35:54 +0000
committerBodo Möller <bodo@openssl.org>2006-06-22 12:35:54 +0000
commitaa17ab7e5732f424c143b154fe563580db420784 (patch)
tree6cc2a176c655e73e715807cacb5a3a84586a8dc7 /ssl/s3_lib.c
parent35908bd04005d9173315df6aae91f0140f63144b (diff)
Put ECCdraft ciphersuites back into default build (but disabled
unless specifically requested)
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index f08c9932c9..0eff243c12 100644
--- 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 */