[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  6b43bbf09c6f31f2b6c66a5e8ef3b668036fbfeb (commit)
      from  9a555706a3fb8f6622e1049ab510a12f4e1bc6a2 (commit)


- Log -----------------------------------------------------------------
commit 6b43bbf09c6f31f2b6c66a5e8ef3b668036fbfeb
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue May 12 19:49:06 2015 +0100

    Fix cipherlist order.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_lib.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index a962b5c..7e9faf4 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 */
     {