summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-08-26 13:11:17 +0100
committerMatt Caswell <matt@openssl.org>2016-08-26 13:38:50 +0100
commit847fe929108da550b506594f52fa1875ea815723 (patch)
tree5394cc2e58a0d6525cf61b0cde046572111f2285 /Configure
parent3953bf53dac62bf8d2e5ebeabc94df388576a8ce (diff)
Fix the no-tls1 option
This also fixes no-tls which is an alias for no-tls1 in 1.0.2 (it is not possible to do no-tls1_1 or no-tls1_2 in 1.0.2). Because it is not possible to disable TLS1.1 or TLS1.2 it no longer follows that disabling TLS1.0 should force the disabling of tlsext. Also a few missing ifdef guards. GitHub Iusse#935 Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure5
1 files changed, 0 insertions, 5 deletions
diff --git a/Configure b/Configure
index 3a772760c8..695b37d073 100755
--- a/Configure
+++ b/Configure
@@ -1082,11 +1082,6 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"})
$disabled{"tls1"} = "forced";
}
-if (defined($disabled{"tls1"}))
- {
- $disabled{"tlsext"} = "forced";
- }
-
if (defined($disabled{"ec"}) || defined($disabled{"dsa"})
|| defined($disabled{"dh"}))
{