diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-12 19:49:06 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-12 20:51:54 +0100 |
| commit | 6b43bbf09c6f31f2b6c66a5e8ef3b668036fbfeb (patch) | |
| tree | 39f8b108b14785e20fcf5f775be461821cac1080 /ssl/s3_lib.c | |
| parent | 9a555706a3fb8f6622e1049ab510a12f4e1bc6a2 (diff) | |
Fix cipherlist order.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a962b5cb63..7e9faf4ab1 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -1839,21 +1839,6 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { 256, 256, }, -#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL - { - 1, - "SCSV", - SSL3_CK_SCSV, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0}, -#endif #ifndef OPENSSL_NO_CAMELLIA /* TLS 1.2 Camellia SHA-256 ciphersuites from RFC5932 */ @@ -2051,6 +2036,23 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { }, #endif +#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL + /* Cipher FF */ + { + 1, + "SCSV", + SSL3_CK_SCSV, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0}, +#endif + #ifndef OPENSSL_NO_EC /* Cipher C001 */ { |