summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-05-15 11:49:56 +0200
committerMatt Caswell <matt@openssl.org>2015-05-23 00:10:51 +0200
commite481f9b90b164fd1053015d1c4e0a0d92076d7a8 (patch)
tree2dbf5d699977893b677a18b213f31c61b59d468b /Configure
parentRT266: Add HTTP proxy/CONNECT to s_client (diff)
downloadopenssl-e481f9b90b164fd1053015d1c4e0a0d92076d7a8.tar.xz
openssl-e481f9b90b164fd1053015d1c4e0a0d92076d7a8.zip
Remove support for OPENSSL_NO_TLSEXT
Given the pervasive nature of TLS extensions it is inadvisable to run OpenSSL without support for them. It also means that maintaining the OPENSSL_NO_TLSEXT option within the code is very invasive (and probably not well tested). Therefore it is being removed. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure10
1 files changed, 0 insertions, 10 deletions
diff --git a/Configure b/Configure
index f0a8accaa4..6cc05bd508 100755
--- a/Configure
+++ b/Configure
@@ -1086,10 +1086,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"}))
@@ -1097,12 +1093,6 @@ if (defined($disabled{"ec"}) || defined($disabled{"dsa"})
$disabled{"gost"} = "forced";
}
-# SRP and HEARTBEATS require TLSEXT
-if (defined($disabled{"tlsext"}))
- {
- $disabled{"srp"} = "forced";
- $disabled{"heartbeats"} = "forced";
- }
if ($target eq "TABLE") {
foreach $target (sort keys %table) {