Commit 35908bd0 authored by Bodo Möller's avatar Bodo Möller
Browse files

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

parent 4a9cfd76

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -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")

ssl/s3_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */