summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-06-13 11:06:12 +0100
committerMatt Caswell <matt@openssl.org>2019-06-17 10:57:19 +0100
commitdbc6268f68e50b2e49d7c5b1157b4f6bcea5d6f9 (patch)
tree67a9fa2beac320e8d437c04225cbc377a0145f2d /Configure
parent8013a933dacc80096e2bfca06c00f9ec29adb35b (diff)
Allow TLSv1.3 in a no-ec build
Now that we have TLSv1.3 FFDHE support there is no reason why we should not allow TLSv1.3 to be used in a no-ec build. This commit enables that to happen. It also fixes no-ec which was previously broken. 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, 1 insertions, 2 deletions
diff --git a/Configure b/Configure
index 69a06d6062..90e97a1bb7 100755
--- a/Configure
+++ b/Configure
@@ -482,7 +482,7 @@ my @disable_cascades = (
"ssl3-method" => [ "ssl3" ],
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
- "ec" => [ "ecdsa", "ecdh" ],
+ "ec" => [ "ecdsa", "ecdh", "sm2" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
@@ -526,7 +526,6 @@ my @disable_cascades = (
"apps" => [ "tests" ],
"tests" => [ "external-tests" ],
"comp" => [ "zlib" ],
- "ec" => [ "tls1_3", "sm2" ],
"sm3" => [ "sm2" ],
sub { !$disabled{"unit-test"} } => [ "heartbeats" ],