Remove ECC ciphersuites from 0.9.8 branch (should use 0.9.9 branch)

diff --git a/CHANGES b/CHANGES
index 82790879f981c54963b72666940e0334fafb8f21..935242efb3495575eedba6dd35918b168fb7a304 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.8b and 0.9.8c  [xx XXX xxxx]
 
+  *) Disable "ECCdraft" ciphersuites (which were not part of the "ALL"
+     alias).  These are now excluded from compilation by default, since
+     OpenSSL 0.9.9[-dev] should be used for TLS with elliptic curves.
+     [Bodo Moeller]
+
   *) Disable rogue ciphersuites:
 
       - SSLv2 0x08 0x00 0x80 ("RC4-64-MD5")

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 0eff243c1298a97f3c0014933464a85e7116fe82..f08c9932c9d03016c72363f1a3207cc54719020a 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1165,6 +1165,7 @@ 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 */
            {
@@ -1516,6 +1517,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
             SSL_ALL_STRENGTHS,
             },
 #endif /* OPENSSL_NO_ECDH */
+#endif
 
 
 /* end of list */