diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-10 23:13:42 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-01-02 15:47:13 +0100 |
commit | 99956528dfc703043ce927797ecd9af1032a180a (patch) | |
tree | a27bb98bb5d771726cabf481d4f7091748916661 /package/network/services/hostapd/patches/700-fix-openssl11.patch | |
parent | 5c4277ec376541b10f1acbea734aa29900eb5722 (diff) | |
download | upstream-99956528dfc703043ce927797ecd9af1032a180a.tar.gz upstream-99956528dfc703043ce927797ecd9af1032a180a.tar.bz2 upstream-99956528dfc703043ce927797ecd9af1032a180a.zip |
hostapd: update to version 2018-12-02 (2.7)
This updates hostapd to version the git version from 2018-12-02 which
matches the 2.7 release.
The removed patches were are already available in the upstream code, one
additional backport is needed to fix a compile problem.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/network/services/hostapd/patches/700-fix-openssl11.patch')
-rw-r--r-- | package/network/services/hostapd/patches/700-fix-openssl11.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/network/services/hostapd/patches/700-fix-openssl11.patch b/package/network/services/hostapd/patches/700-fix-openssl11.patch deleted file mode 100644 index 86343c150b..0000000000 --- a/package/network/services/hostapd/patches/700-fix-openssl11.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 672540d4ddbd24782b5c65b35d636bdfe8a90d0f Mon Sep 17 00:00:00 2001 -From: Rosen Penev <rosenp@gmail.com> -Date: Fri, 15 Jun 2018 18:35:30 -0700 -Subject: [PATCH] Fix compile with OpenSSL 1.1.0 and deprecated APIs - -SSL_session_reused is the same as SSL_cache_hit. The engine load stuff is -now handled by OPENSSL_init. - -Signed-off-by: Rosen Penev <rosenp@gmail.com> ---- - src/crypto/tls_openssl.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -1024,8 +1024,10 @@ void * tls_init(const struct tls_config - - #ifndef OPENSSL_NO_ENGINE - wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine"); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - ERR_load_ENGINE_strings(); - ENGINE_load_dynamic(); -+#endif /* OPENSSL_VERSION_NUMBER */ - - if (conf && - (conf->opensc_engine_path || conf->pkcs11_engine_path || -@@ -3874,7 +3876,7 @@ struct wpabuf * tls_connection_decrypt(v - - 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; - } - - |