diff options
author | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
commit | b612799a80af398040efc2416e0d09dcb0da1cf5 (patch) | |
tree | fdc1238fdb3b4c6b642373b068708af7beea2ba1 /Configure | |
parent | 6c62f9e1639a7d1a879f363a99882920104dfedb (diff) | |
download | openssl-b612799a80af398040efc2416e0d09dcb0da1cf5.tar.gz |
Revert "Remove heartbeats completely"
Done too soon, this is for future OpenSSL 1.2.0
This reverts commit 6c62f9e1639a7d1a879f363a99882920104dfedb.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -367,6 +367,7 @@ my @disablables = ( "fuzz-libfuzzer", "fuzz-afl", "gost", + "heartbeats", "hw(-.+)?", "idea", "makedepend", @@ -434,6 +435,7 @@ our %disabled = ( # "what" => "comment" "external-tests" => "default", "fuzz-libfuzzer" => "default", "fuzz-afl" => "default", + "heartbeats" => "default", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -485,8 +487,8 @@ my @disable_cascades = ( "tls" => [ @tls ], - # SRP requires TLSEXT - "tlsext" => [ "srp" ], + # SRP and HEARTBEATS require TLSEXT + "tlsext" => [ "srp", "heartbeats" ], "crypto-mdebug" => [ "crypto-mdebug-backtrace" ], @@ -504,6 +506,7 @@ my @disable_cascades = ( "stdio" => [ "apps", "capieng" ], "apps" => [ "tests" ], "comp" => [ "zlib" ], + sub { !$disabled{"unit-test"} } => [ "heartbeats" ], sub { !$disabled{"msan"} } => [ "asm" ], ); |