diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-04-24 09:00:51 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-04-24 09:00:51 +0300 |
| commit | 60ef2a13460783082cc09ef0b95bf35cc0c545bc (patch) | |
| tree | b11d787cfe8bfbbbbb06a04933fea068d567ef15 | |
| parent | 3bd20bca4bf7721cc4f0d905f8644350f554d030 (diff) | |
hostapd: libressl supported by upstream
| -rw-r--r-- | net-wireless/hostapd/files/libressl.patch | 33 | ||||
| -rw-r--r-- | net-wireless/hostapd/hostapd-scm.ebuild | 2 |
2 files changed, 0 insertions, 35 deletions
diff --git a/net-wireless/hostapd/files/libressl.patch b/net-wireless/hostapd/files/libressl.patch deleted file mode 100644 index c8e9644..0000000 --- a/net-wireless/hostapd/files/libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index 4413ec325..7dbbd2d8c 100644 ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -2457,12 +2413,6 @@ static int tls_set_conn_flags(struct tls_connection *conn, unsigned int flags, - else - SSL_clear_options(ssl, SSL_OP_NO_TLSv1_1); - #endif /* SSL_OP_NO_TLSv1_1 */ --#ifdef SSL_OP_NO_TLSv1_2 -- if (flags & TLS_CONN_DISABLE_TLSv1_2) -- SSL_set_options(ssl, SSL_OP_NO_TLSv1_2); -- else -- SSL_clear_options(ssl, SSL_OP_NO_TLSv1_2); --#endif /* SSL_OP_NO_TLSv1_2 */ - #ifdef CONFIG_SUITEB - #ifdef OPENSSL_IS_BORINGSSL - /* Start with defaults from BoringSSL */ -@@ -4344,15 +4294,6 @@ int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn, - } - } - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10101000L -- if (params->flags & TLS_CONN_EAP_FAST) { -- /* Need to disable TLS v1.3 at least for now since OpenSSL 1.1.1 -- * refuses to start the handshake with the modified ciphersuite -- * list (no TLS v1.3 ciphersuites included) for EAP-FAST. */ -- wpa_printf(MSG_DEBUG, "OpenSSL: Disable TLSv1.3 for EAP-FAST"); -- SSL_set_options(conn->ssl, SSL_OP_NO_TLSv1_3); -- } --#endif - #endif /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */ - - while ((err = ERR_get_error())) { diff --git a/net-wireless/hostapd/hostapd-scm.ebuild b/net-wireless/hostapd/hostapd-scm.ebuild index a5e759b..a446f45 100644 --- a/net-wireless/hostapd/hostapd-scm.ebuild +++ b/net-wireless/hostapd/hostapd-scm.ebuild @@ -42,8 +42,6 @@ src_prepare() { sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ "${S}/hostapd.conf" || die - cd .. - use libressl && eapply "${FILESDIR}/libressl.patch" } src_configure() { |