diff options
author | Richard Levitte <levitte@openssl.org> | 2017-11-07 16:04:15 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-11-07 16:31:17 +0100 |
commit | f70425d3ac5e4ef17cfa116d99f8f03bbac1c7f2 (patch) | |
tree | 6da3d1e848a632f82830c47f2b316fc05c2c87c3 /Configure | |
parent | 2df7971728ddd388a77de56acc01e4bab37796bb (diff) |
Configure: cleanup @disable_cascade
'rsa', 'sha' and 'tlsext' can't be disabled, not even as a consequence
of other conditions, so having cascading disables that depend on them
is futile. Clean up!
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4693)
(cherry picked from commit 89635075d84353fc0c3d44a82fd0903ccd4ab24a)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -461,31 +461,10 @@ my @disable_cascades = ( 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" ], - "sha" => [ "ssl", "tls1", "tls1_1", "dtls1" ], - - # Additionally, SSL 3.0 requires either RSA or DSA+DH - sub { $disabled{rsa} - && ($disabled{dsa} || $disabled{dh}); } - => [ "ssl" ], - - # (D)TLS 1.0 and TLS 1.1 also require either RSA or DSA+DH - # or ECDSA + ECDH. (D)TLS 1.2 has this requirement as well. - # (XXX: We don't support PSK-only builds). - sub { $disabled{rsa} - && ($disabled{dsa} || $disabled{dh}) - && ($disabled{ecdsa} || $disabled{ecdh}); } - => [ "tls1", "tls1_1", "tls1_2", - "dtls1", "dtls1_2" ], - "tls" => [ @tls ], sub { 0 == scalar grep { !$disabled{$_} } @tls } => [ "tls" ], - # SRP and HEARTBEATS require TLSEXT - "tlsext" => [ "srp", "heartbeats" ], - "crypto-mdebug" => [ "crypto-mdebug-backtrace" ], # Without DSO, we can't load dynamic engines, so don't build them dynamic |