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

OpenSSL: Fix compile with OpenSSL 1.1.0 and deprecated APIs

Browse source 
SSL_session_reused() is the same as the deprecated SSL_cache_hit(). The
engine load stuff is now handled by OPENSSL_init().

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-07-27 19:31:09 -07:00 committed by Jouni Malinen
parent c6e1a9a0b3
commit 373c796948
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/crypto/tls_openssl.c
View file

@ -1024,8 +1024,10 @@ void * tls_init(const struct tls_config *conf)
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine"); wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine");
#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_ENGINE_strings(); ERR_load_ENGINE_strings();
ENGINE_load_dynamic(); ENGINE_load_dynamic();
#endif /* OPENSSL_VERSION_NUMBER */
if (conf && if (conf &&
(conf->opensc_engine_path || conf->pkcs11_engine_path || (conf->opensc_engine_path || conf->pkcs11_engine_path ||
@ -3874,7 +3876,7 @@ struct wpabuf * tls_connection_decrypt(void *tls_ctx,
int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn) int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn)
{ {
return conn ? SSL_cache_hit(conn->ssl) : 0; return conn ? SSL_session_reused(conn->ssl) : 0;
} }