summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-02-17 20:48:28 +0100
committerRichard Levitte <levitte@openssl.org>2017-02-17 21:28:41 +0100
commit343a7467c270c54a8e1c85e88e807a1c2e0b6127 (patch)
treed77ec42a15dbfa86afc38087b30e83334526e1a7 /Configure
parentd0823f7a9bc0545144454b55a131c258ac584e20 (diff)
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)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 4 insertions, 0 deletions
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" ],