summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorBen Laurie <ben@links.org>2016-03-27 12:28:23 +0100
committerBen Laurie <ben@links.org>2016-03-30 12:14:56 +0100
commit686c86a4301309fa6eb22283cc8fd78adc7d8eea (patch)
treed7bfb7a5512f296d1ad9740d63ce58a8c2a544cb /Configure
parent0c767ddcbbbddf79ae61a4b307df0115ced0c110 (diff)
More things that don't work together.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/Configure b/Configure
index b4afea950e..34db14203e 100755
--- a/Configure
+++ b/Configure
@@ -359,6 +359,7 @@ my @disable_cascades = (
"ec" => [ "ecdsa", "ecdh" ],
"dgram" => [ "dtls", "sctp" ],
+ "sock" => [ "sctp" ],
"dtls" => [ @dtls ],
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
@@ -394,6 +395,7 @@ my @disable_cascades = (
"shared" => [ "dynamic-engine" ],
"engine" => [ "afalgeng" ],
"comp" => [ "zlib" ],
+ sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
);
# Avoid protocol support holes. Also disable all versions below N, if version