From: Richard Levitte <levitte@openssl.org>
Date: Fri, 17 Feb 2017 19:48:28 +0000 (+0100)
Subject: If all versions of a proto are disabled, disabled the proto as well
X-Git-Tag: OpenSSL_1_1_1-pre1~2342
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=343a7467c270c54a8e1c85e88e807a1c2e0b6127;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2670)
---

diff --git a/Configure b/Configure
index 1fe2280fd4..ac2571f932 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" ],