summaryrefslogtreecommitdiff
path: root/ssl/ssl_txt.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-05-15 10:49:56 +0100
committerMatt Caswell <matt@openssl.org>2015-05-22 23:10:51 +0100
commite481f9b90b164fd1053015d1c4e0a0d92076d7a8 (patch)
tree2dbf5d699977893b677a18b213f31c61b59d468b /ssl/ssl_txt.c
parent552bf8ec5e64d1a169069111850ebc5d250e0499 (diff)
downloadopenssl-new-e481f9b90b164fd1053015d1c4e0a0d92076d7a8.tar.gz
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 'ssl/ssl_txt.c')
-rw-r--r--ssl/ssl_txt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index 0da2bb44b9..0f506f0fb9 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -182,7 +182,6 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0)
goto err;
#endif
-#ifndef OPENSSL_NO_TLSEXT
if (x->tlsext_tick_lifetime_hint) {
if (BIO_printf(bp,
"\n TLS session ticket lifetime hint: %ld (seconds)",
@@ -196,7 +195,6 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
<= 0)
goto err;
}
-#endif
#ifndef OPENSSL_NO_COMP
if (x->compress_meth != 0) {