diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-15 10:49:56 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-22 23:10:51 +0100 |
| commit | e481f9b90b164fd1053015d1c4e0a0d92076d7a8 (patch) | |
| tree | 2dbf5d699977893b677a18b213f31c61b59d468b /ssl/ssl_rsa.c | |
| parent | 552bf8ec5e64d1a169069111850ebc5d250e0499 (diff) | |
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_rsa.c')
| -rw-r--r-- | ssl/ssl_rsa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index a9c832c8b6..f4851266a1 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -738,7 +738,6 @@ int SSL_use_certificate_chain_file(SSL *ssl, const char *file) } #endif -#ifndef OPENSSL_NO_TLSEXT static int serverinfo_find_extension(const unsigned char *serverinfo, size_t serverinfo_length, unsigned int extension_type, @@ -910,7 +909,7 @@ int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo, return 1; } -# ifndef OPENSSL_NO_STDIO +#ifndef OPENSSL_NO_STDIO int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) { unsigned char *serverinfo = NULL; @@ -1000,5 +999,4 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) BIO_free(bin); return ret; } -# endif /* OPENSSL_NO_STDIO */ -#endif /* OPENSSL_NO_TLSEXT */ +#endif /* OPENSSL_NO_STDIO */ |