[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a9c27fe19f159391aac7e591b64b44c1ea9d3642 (commit)
      from  bc87fb6bcd8f9ff419ca309e88a2a2e8346e17a2 (commit)


- Log -----------------------------------------------------------------
commit a9c27fe19f159391aac7e591b64b44c1ea9d3642
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Aug 18 15:47:04 2016 -0500

    Sort %disabled in Configure
    
    @disablables is sorted, but these were just added at the end of
    %disabled in commits c2e27310 and 22e3dcb7.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 Configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index 0a33fc2..4a7d322 100755
--- a/Configure
+++ b/Configure
@@ -365,10 +365,13 @@ my %deprecated_disablables = (
 
 our %disabled = ( # "what"         => "comment"
                   "asan"		=> "default",
+		  "crypto-mdebug"       => "default",
+		  "crypto-mdebug-backtrace" => "default",
 		  "ec_nistp_64_gcc_128" => "default",
 		  "egd"                 => "default",
 		  "fuzz-libfuzzer"	=> "default",
 		  "fuzz-afl"		=> "default",
+		  "heartbeats"          => "default",
 		  "md2"                 => "default",
                   "msan"                => "default",
 		  "rc5"                 => "default",
@@ -381,9 +384,6 @@ our %disabled = ( # "what"         => "comment"
 		  "weak-ssl-ciphers"    => "default",
 		  "zlib"                => "default",
 		  "zlib-dynamic"        => "default",
-		  "crypto-mdebug"       => "default",
-		  "crypto-mdebug-backtrace" => "default",
-		  "heartbeats"          => "default",
 		);
 
 # Note: => pair form used for aesthetics, not to truly make a hash table