jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

OpenSSL: Remove SSL_{CTX_,}_clear_options ifdefs

Browse source 
This simplifies the implementation since the SSL_clear_options() and
SSL_CTX_clear_options() are available in all supported versions of
OpenSSL. These were previously needed with older (now obsolete) versions
of OpenSSL, but the ifdefs were missed when removing the more explicit
version macro based backwards compatibility sections.

In practice, this reverts commit
d53d2596e4.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-12-21 12:06:21 +02:00 committed by Jouni Malinen
parent e297cc0d23
commit 4be02b71bb
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/crypto/tls_openssl.c
View file

@ -2254,10 +2254,8 @@ static void tls_set_conn_flags(SSL *ssl, unsigned int flags)
#ifdef SSL_OP_NO_TICKET #ifdef SSL_OP_NO_TICKET
if (flags & TLS_CONN_DISABLE_SESSION_TICKET) if (flags & TLS_CONN_DISABLE_SESSION_TICKET)
SSL_set_options(ssl, SSL_OP_NO_TICKET); SSL_set_options(ssl, SSL_OP_NO_TICKET);
#ifdef SSL_clear_options
else else
SSL_clear_options(ssl, SSL_OP_NO_TICKET); SSL_clear_options(ssl, SSL_OP_NO_TICKET);
#endif /* SSL_clear_options */
#endif /* SSL_OP_NO_TICKET */ #endif /* SSL_OP_NO_TICKET */
#ifdef SSL_OP_NO_TLSv1 #ifdef SSL_OP_NO_TLSv1
@ -4120,10 +4118,8 @@ int tls_global_set_params(void *tls_ctx,
#ifdef SSL_OP_NO_TICKET #ifdef SSL_OP_NO_TICKET
if (params->flags & TLS_CONN_DISABLE_SESSION_TICKET) if (params->flags & TLS_CONN_DISABLE_SESSION_TICKET)
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_TICKET); SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_TICKET);
#ifdef SSL_CTX_clear_options
else else
SSL_CTX_clear_options(ssl_ctx, SSL_OP_NO_TICKET); SSL_CTX_clear_options(ssl_ctx, SSL_OP_NO_TICKET);
#endif /* SSL_clear_options */
#endif /* SSL_OP_NO_TICKET */ #endif /* SSL_OP_NO_TICKET */
#ifdef HAVE_OCSP #ifdef HAVE_OCSP