From: Ben Laurie <ben@links.org>
Date: Sun, 27 Mar 2016 11:28:23 +0000 (+0100)
Subject: More things that don't work together.
X-Git-Tag: OpenSSL_1_1_0-pre5~196
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=686c86a4301309fa6eb22283cc8fd78adc7d8eea;p=oweals%2Fopenssl.git

More things that don't work together.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

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