summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-06-13 19:34:37 +0100
committerMatt Caswell <matt@openssl.org>2019-06-17 10:57:19 +0100
commit65dc5c3cc10af7c6f24ecd922adb7b6d17a9fe65 (patch)
treeb4b969f236f90015b0d63ef80781e7bd49ed2f4b /Configure
parentdbc6268f68e50b2e49d7c5b1157b4f6bcea5d6f9 (diff)
Fix no-ec with no-dh
Make sure that the combination of no-ec with no-dh builds successfully. If neither ec or dh are available then TLSv1.3 is not possible. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9156)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/Configure b/Configure
index 90e97a1bb7..c3f4f99ba6 100755
--- a/Configure
+++ b/Configure
@@ -483,7 +483,8 @@ my @disable_cascades = (
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
"ec" => [ "ecdsa", "ecdh", "sm2" ],
-
+ sub { $disabled{"ec"} && $disabled{"dh"} }
+ => [ "tls1_3" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],