[patch] wpa_supplicant-2.6-openssl-1.1.0-compat.patch

file_649004.txt (text/plain), 1.24 KB, created by Quentin Minster on 2018-02-27 23:14:06 UTC

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 23ac64b..f41b5e7 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1000,7 +1000,11 @@ void * tls_init(const struct tls_config *conf)
 #ifndef OPENSSL_NO_ENGINE
 	wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine");
 	ERR_load_ENGINE_strings();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	ENGINE_load_dynamic();
+#else
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL);
+#endif
 
 	if (conf &&
 	    (conf->opensc_engine_path || conf->pkcs11_engine_path ||
@@ -1118,7 +1122,11 @@ static int tls_engine_init(struct tls_connection *conn, const char *engine_id,
 
 	ERR_clear_error();
 #ifdef ANDROID
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	ENGINE_load_dynamic();
+#else
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL);
+#endif
 #endif
 	conn->engine = ENGINE_by_id(engine_id);
 	if (!conn->engine) {
@@ -3506,7 +3514,11 @@ struct wpabuf * tls_connection_decrypt(void *tls_ctx,
 
 int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn)
 {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	return conn ? SSL_cache_hit(conn->ssl) : 0;
+#else
+	return conn ? SSL_session_reused(conn->ssl) : 0;
+#endif
 }