diff options
Diffstat (limited to 'testing/source/wpa_supplicant/patches')
7 files changed, 0 insertions, 216 deletions
diff --git a/testing/source/wpa_supplicant/patches/allow-tlsv1.patch b/testing/source/wpa_supplicant/patches/allow-tlsv1.patch deleted file mode 100644 index eb5fb7818..000000000 --- a/testing/source/wpa_supplicant/patches/allow-tlsv1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Andrej Shadura <andrewsh@debian.org> -Subject: Enable TLSv1.0 by default - -OpenSSL 1.1.1 disables TLSv1.0 by default and sets the security level to 2. -Some older networks may support for TLSv1.0 and less secure cyphers. - ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -988,6 +988,13 @@ - os_free(data); - return NULL; - } -+ -+#ifndef EAP_SERVER_TLS -+ /* Enable TLSv1.0 by default to allow connecting to legacy -+ * networks since Debian OpenSSL is set to minimum TLSv1.2 and SECLEVEL=2. */ -+ SSL_CTX_set_min_proto_version(ssl, TLS1_VERSION); -+#endif -+ - data->ssl = ssl; - if (conf) - data->tls_session_lifetime = conf->tls_session_lifetime; diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index 97a8cc7f3..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch deleted file mode 100644 index c3b3568c6..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c ---- wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout 2010-09-07 10:43:39.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c 2010-12-07 18:57:45.163457000 -0600 -@@ -1262,10 +1262,10 @@ void wpa_supplicant_associate(struct wpa - - if (assoc_failed) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 10 : 5; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; - } else if (wpa_s->conf->ap_scan == 1) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 20; - } - wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0); - } diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch deleted file mode 100644 index b7478dad8..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch deleted file mode 100644 index a68685186..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- wpa_supplicant-0.6.3/src/utils/wpa_debug.c.flush-debug 2007-07-30 23:15:34.000000000 -0400 -+++ wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2007-07-30 23:17:06.000000000 -0400 -@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void) - if (out_file) { - fprintf(out_file, "%ld.%06u: ", (long) tv.sec, - (unsigned int) tv.usec); -+ fflush(out_file); - } else - #endif /* CONFIG_DEBUG_FILE */ - printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); -@@ -185,6 +186,7 @@ void wpa_printf(int level, char *fmt, .. - if (out_file) { - vfprintf(out_file, fmt, ap); - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - vprintf(fmt, ap); -@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons - fprintf(out_file, " [REMOVED]"); - } - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - printf("%s - hexdump(len=%lu):", title, (unsigned long) len); -@@ -262,12 +265,14 @@ static void _wpa_hexdump_ascii(int level - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [REMOVED]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - if (buf == NULL) { - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [NULL]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n", -@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level - pos += llen; - len -= llen; - } -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - if (!show) { diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch deleted file mode 100644 index c54cd9a25..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9404f356e394604d1d3d6dbffc52abd54260e4d4 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel <lkundrak@v3.sk> -Date: Tue, 27 Oct 2015 08:56:35 +0100 -Subject: [PATCH] wpa_supplicant: allow overriding the names of the Qt4 tools - -This is useful for distributions that ship different versions of Qt in -different locations. ---- - wpa_supplicant/Makefile | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index ad9ead9..b19676d 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -11,6 +11,9 @@ export INCDIR ?= /usr/local/include/ - export BINDIR ?= /usr/local/sbin/ - PKG_CONFIG ?= pkg-config - -+QMAKE ?= qmake -+LRELEASE ?= lrelease -+ - CFLAGS += $(EXTRA_CFLAGS) - CFLAGS += -I$(abspath ../src) - CFLAGS += -I$(abspath ../src/utils) -@@ -1787,10 +1790,10 @@ wpa_gui: - @echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement" - - wpa_gui-qt4/Makefile: -- qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro -+ $(QMAKE) -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro - - wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts -- lrelease wpa_gui-qt4/wpa_gui.pro -+ $(LRELEASE) wpa_gui-qt4/wpa_gui.pro - - wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm - $(MAKE) -C wpa_gui-qt4 --- -2.6.2 - diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch b/testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch deleted file mode 100644 index c646a3046..000000000 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 763a4ef660e2bd81f6cdc71a2f29a0a3e71b2ebc Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 22 Nov 2016 15:48:17 +0100 -Subject: [PATCH 1/2] quiet an annoying and frequent syslog message - ---- - wpa_supplicant/events.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c -index abe3b47..72a0412 100644 ---- a/wpa_supplicant/events.c -+++ b/wpa_supplicant/events.c -@@ -1555,11 +1555,11 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, - if (wpa_s->last_scan_req == MANUAL_SCAN_REQ && - wpa_s->manual_scan_use_id && wpa_s->own_scan_running && - own_request && !(data && data->scan_info.external_scan)) { -- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS "id=%u", -+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS "id=%u", - wpa_s->manual_scan_id); - wpa_s->manual_scan_use_id = 0; - } else { -- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS); -+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS); - } - wpas_notify_scan_results(wpa_s); - --- -2.9.3 - |