From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 12 May 2015 18:49:06 +0000 (+0100)
Subject: Fix cipherlist order.
X-Git-Tag: OpenSSL_1_1_0-pre1~1166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b43bbf09c6f31f2b6c66a5e8ef3b668036fbfeb;p=oweals%2Fopenssl.git

Fix cipherlist order.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

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 */
     {