summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-10-06 11:22:28 +0200
committerRichard Levitte <levitte@openssl.org>2016-11-15 10:45:21 +0100
commit6c62f9e1639a7d1a879f363a99882920104dfedb (patch)
treec3696f02ee053fc5bf9e2250b811973d5aaedd51 /Configure
parent54c68d35c6b7e7650856beb949b45363ce40ca93 (diff)
Remove heartbeats completely
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1669)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure7
1 files changed, 2 insertions, 5 deletions
diff --git a/Configure b/Configure
index 307b1d8ac4..ab935e4372 100755
--- a/Configure
+++ b/Configure
@@ -367,7 +367,6 @@ my @disablables = (
"fuzz-libfuzzer",
"fuzz-afl",
"gost",
- "heartbeats",
"hw(-.+)?",
"idea",
"makedepend",
@@ -435,7 +434,6 @@ our %disabled = ( # "what" => "comment"
"external-tests" => "default",
"fuzz-libfuzzer" => "default",
"fuzz-afl" => "default",
- "heartbeats" => "default",
"md2" => "default",
"msan" => "default",
"rc5" => "default",
@@ -487,8 +485,8 @@ my @disable_cascades = (
"tls" => [ @tls ],
- # SRP and HEARTBEATS require TLSEXT
- "tlsext" => [ "srp", "heartbeats" ],
+ # SRP requires TLSEXT
+ "tlsext" => [ "srp" ],
"crypto-mdebug" => [ "crypto-mdebug-backtrace" ],
@@ -506,7 +504,6 @@ my @disable_cascades = (
"stdio" => [ "apps", "capieng" ],
"apps" => [ "tests" ],
"comp" => [ "zlib" ],
- sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
sub { !$disabled{"msan"} } => [ "asm" ],
);