aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2016-12-21 10:06:21 (GMT)
committerJouni Malinen <j@w1.fi>2016-12-21 10:06:21 (GMT)
commit4be02b71bb82ac8571f533a9214e7205a398e401 (patch)
tree56fcc835743f0d77aecadf67a5dc267e27e54d79
parente297cc0d23f77cdb3cd89ca28f8c4f28eab0be9d (diff)
downloadhostap-4be02b71bb82ac8571f533a9214e7205a398e401.zip
hostap-4be02b71bb82ac8571f533a9214e7205a398e401.tar.gz
hostap-4be02b71bb82ac8571f533a9214e7205a398e401.tar.bz2
OpenSSL: Remove SSL_{CTX_,}_clear_options ifdefs
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 d53d2596e4919bc2f7b6acfa6a9a9baba1d68360. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
-rw-r--r--src/crypto/tls_openssl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index a7d4880..9ca58b3 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -2254,10 +2254,8 @@ static void tls_set_conn_flags(SSL *ssl, unsigned int flags)
#ifdef SSL_OP_NO_TICKET
if (flags & TLS_CONN_DISABLE_SESSION_TICKET)
SSL_set_options(ssl, SSL_OP_NO_TICKET);
-#ifdef SSL_clear_options
else
SSL_clear_options(ssl, SSL_OP_NO_TICKET);
-#endif /* SSL_clear_options */
#endif /* SSL_OP_NO_TICKET */
#ifdef SSL_OP_NO_TLSv1
@@ -4120,10 +4118,8 @@ int tls_global_set_params(void *tls_ctx,
#ifdef SSL_OP_NO_TICKET
if (params->flags & TLS_CONN_DISABLE_SESSION_TICKET)
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_TICKET);
-#ifdef SSL_CTX_clear_options
else
SSL_CTX_clear_options(ssl_ctx, SSL_OP_NO_TICKET);
-#endif /* SSL_clear_options */
#endif /* SSL_OP_NO_TICKET */
#ifdef HAVE_OCSP