[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  343a7467c270c54a8e1c85e88e807a1c2e0b6127 (commit)
      from  d0823f7a9bc0545144454b55a131c258ac584e20 (commit)


- Log -----------------------------------------------------------------
commit 343a7467c270c54a8e1c85e88e807a1c2e0b6127
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 17 20:48:28 2017 +0100

    If all versions of a proto are disabled, disabled the proto as well
    
    For example, 'no-dtls1 no-dtls1_2' will imply 'no-dtls'
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2670)

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

Summary of changes:
 Configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Configure b/Configure
index 1fe2280..ac2571f 100755
--- a/Configure
+++ b/Configure
@@ -472,6 +472,8 @@ my @disable_cascades = (
     "dgram"		=> [ "dtls", "sctp" ],
     "sock"		=> [ "dgram" ],
     "dtls"		=> [ @dtls ],
+    sub { 0 == scalar grep { !$disabled{$_} } @dtls }
+			=> [ "dtls" ],
 
     # SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
     "md5"		=> [ "ssl", "tls1", "tls1_1", "dtls1" ],
@@ -492,6 +494,8 @@ my @disable_cascades = (
 			     "dtls1", "dtls1_2" ],
 
     "tls"		=> [ @tls ],
+    sub { 0 == scalar grep { !$disabled{$_} } @tls }
+			=> [ "tls" ],
 
     # SRP and HEARTBEATS require TLSEXT
     "tlsext"		=> [ "srp", "heartbeats" ],