From bd0eb93ab4d35e80ff81f94eea44aa2adf5e39f7 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 4 Jan 2023 18:58:48 +0300 Subject: [PATCH] wpa_supplicant ver. bump --- network/connection/wpa_supplicant/actions.py | 11 +- ...-HT40-secondary-channel-is-supported.patch | 52 --- ...of-secondary-device-types-for-P2P-gr.patch | 38 -- ...upplicant-allow-legacy-renegotiation.patch | 20 + .../wpa_supplicant-flush-debug-output.patch | 54 +-- .../wpa_supplicant-openssl-more-algs.patch | 15 - ...upplicant-quiet-scan-results-message.patch | 36 +- .../wpa_supplicant-0.6.3-WEP232.patch | 12 - .../wpa_supplicant-driver-wext-debug.patch | 143 -------- .../files/suse/wpa_supplicant-errormsg.patch | 19 - ..._use_pkg-config_for_pcsc-lite_module.patch | 17 - ...t-call-dbus-functions-with-NULL-path.patch | 60 --- ..._supplicant-1.0-generate-libeap-peer.patch | 347 ------------------ .../files/wpa_supplicant.config | 67 +++- network/connection/wpa_supplicant/pspec.xml | 39 +- 15 files changed, 156 insertions(+), 774 deletions(-) delete mode 100644 network/connection/wpa_supplicant/files/0001-AP-Verify-that-HT40-secondary-channel-is-supported.patch delete mode 100644 network/connection/wpa_supplicant/files/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch create mode 100644 network/connection/wpa_supplicant/files/fedora/wpa_supplicant-allow-legacy-renegotiation.patch delete mode 100644 network/connection/wpa_supplicant/files/fedora/wpa_supplicant-openssl-more-algs.patch delete mode 100644 network/connection/wpa_supplicant/files/mandriva/wpa_supplicant-0.6.3-WEP232.patch delete mode 100644 network/connection/wpa_supplicant/files/suse/wpa_supplicant-driver-wext-debug.patch delete mode 100644 network/connection/wpa_supplicant/files/suse/wpa_supplicant-errormsg.patch delete mode 100644 network/connection/wpa_supplicant/files/ubuntu/01_use_pkg-config_for_pcsc-lite_module.patch delete mode 100644 network/connection/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch delete mode 100644 network/connection/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch diff --git a/network/connection/wpa_supplicant/actions.py b/network/connection/wpa_supplicant/actions.py index 405c8c3936..80dd8c10c9 100644 --- a/network/connection/wpa_supplicant/actions.py +++ b/network/connection/wpa_supplicant/actions.py @@ -16,13 +16,16 @@ def build(): cflags = get.CFLAGS() + " -DCONFIG_DEBUG_SYSLOG" shelltools.export("CFLAGS", cflags) - autotools.make("V=1") - autotools.make("eapol_test") + autotools.make("LIBDIR=/usr/lib BINDIR=/usr/sbin V=1") + # autotools.make("eapol_test") + autotools.make("LIBDIR=/usr/lib BINDIR=/usr/sbin eapol_test") def install(): shelltools.cd("wpa_supplicant") + autotools.rawInstall("LIBDIR=/usr/lib BINDIR=/usr/sbin eapol_test DESTDIR=%s" % get.installDIR()) - for bin in ["wpa_supplicant", "wpa_cli", "wpa_passphrase", "eapol_test"]: + # for bin in ["wpa_supplicant", "wpa_cli", "wpa_passphrase", "eapol_test"]: + for bin in ["eapol_test"]: pisitools.dosbin(bin) # Install dbus files @@ -33,4 +36,4 @@ def install(): pisitools.doman("doc/docbook/*.8") pisitools.newdoc("wpa_supplicant.conf", "wpa_supplicant.conf.example") - pisitools.dodoc("ChangeLog", "../COPYING", "eap_testing.txt", "../README", "todo.txt") \ No newline at end of file + pisitools.dodoc("ChangeLog", "../COPYING", "eap_testing.txt", "../README", "todo.txt") diff --git a/network/connection/wpa_supplicant/files/0001-AP-Verify-that-HT40-secondary-channel-is-supported.patch b/network/connection/wpa_supplicant/files/0001-AP-Verify-that-HT40-secondary-channel-is-supported.patch deleted file mode 100644 index b2fef12c1a..0000000000 --- a/network/connection/wpa_supplicant/files/0001-AP-Verify-that-HT40-secondary-channel-is-supported.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 12 Nov 2010 18:31:56 +0200 -Subject: [PATCH 1/3] AP: Verify that HT40 secondary channel is supported - -Refuse to enable HT40 mode AP unless both the primary and secondary -channels are enabled for AP use. -(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304) ---- - src/ap/hw_features.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c -index 0159c72..7fc5b83 100644 ---- a/src/ap/hw_features.c -+++ b/src/ap/hw_features.c -@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface) - break; - } - } -+ if (ok && iface->conf->secondary_channel) { -+ int sec_ok = 0; -+ int sec_chan = iface->conf->channel + -+ iface->conf->secondary_channel * 4; -+ for (j = 0; j < iface->current_mode->num_channels; j++) { -+ struct hostapd_channel_data *chan = -+ &iface->current_mode->channels[j]; -+ if (!(chan->flag & HOSTAPD_CHAN_DISABLED) && -+ (chan->chan == sec_chan)) { -+ sec_ok = 1; -+ break; -+ } -+ } -+ if (!sec_ok) { -+ hostapd_logger(iface->bss[0], NULL, -+ HOSTAPD_MODULE_IEEE80211, -+ HOSTAPD_LEVEL_WARNING, -+ "Configured HT40 secondary channel " -+ "(%d) not found from the channel list " -+ "of current mode (%d) %s", -+ sec_chan, iface->current_mode->mode, -+ hostapd_hw_mode_txt( -+ iface->current_mode->mode)); -+ ok = 0; -+ } -+ } - if (iface->conf->channel == 0) { - /* TODO: could request a scan of neighboring BSSes and select - * the channel automatically */ --- -1.7.3.4 - diff --git a/network/connection/wpa_supplicant/files/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/network/connection/wpa_supplicant/files/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch deleted file mode 100644 index 4657b55d85..0000000000 --- a/network/connection/wpa_supplicant/files/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 9 Nov 2020 11:43:12 +0200 -Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group - client - -Parsing and copying of WPS secondary device types list was verifying -that the contents is not too long for the internal maximum in the case -of WPS messages, but similar validation was missing from the case of P2P -group information which encodes this information in a different -attribute. This could result in writing beyond the memory area assigned -for these entries and corrupting memory within an instance of struct -p2p_device. This could result in invalid operations and unexpected -behavior when trying to free pointers from that corrupted memory. - -Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 -Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") -Signed-off-by: Jouni Malinen ---- - src/p2p/p2p.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c -index 74b7b52ae05c..5cbfc217fc1f 100644 ---- a/src/p2p/p2p.c -+++ b/src/p2p/p2p.c -@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, - dev->info.config_methods = cli->config_methods; - os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); - dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; -+ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) -+ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; - os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, - dev->info.wps_sec_dev_type_list_len); - } --- -2.25.1 - diff --git a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-allow-legacy-renegotiation.patch b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-allow-legacy-renegotiation.patch new file mode 100644 index 0000000000..cbfd9ca17e --- /dev/null +++ b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-allow-legacy-renegotiation.patch @@ -0,0 +1,20 @@ +diff -up wpa_supplicant-2.10/src/crypto/tls_openssl.c.legacy-server-connect wpa_supplicant-2.10/src/crypto/tls_openssl.c +--- wpa_supplicant-2.10/src/crypto/tls_openssl.c.legacy-server-connect 2022-01-16 15:51:29.000000000 -0500 ++++ wpa_supplicant-2.10/src/crypto/tls_openssl.c 2022-04-28 02:47:26.863529683 -0400 +@@ -1049,6 +1049,16 @@ + SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv2); + SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv3); + ++ /* Many enterprise PEAP server implementations (e.g. used in large ++ corporations and universities) do not support RFC5746 secure ++ renegotiation, and starting with OpenSSL 3.0, ++ SSL_OP_LEGACY_SERVER_CONNECT is no longer set as part of SSL_OP_ALL. ++ So until we implement a way to request SSL_OP_LEGACY_SERVER_CONNECT ++ only in EAP peer mode, just set SSL_OP_LEGACY_SERVER_CONNECT ++ globally. */ ++ ++ SSL_CTX_set_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT); ++ + SSL_CTX_set_mode(ssl, SSL_MODE_AUTO_RETRY); + + #ifdef SSL_MODE_NO_AUTO_CHAIN diff --git a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-flush-debug-output.patch b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-flush-debug-output.patch index a686851867..f2295bcef3 100644 --- a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-flush-debug-output.patch +++ b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-flush-debug-output.patch @@ -1,49 +1,35 @@ ---- 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) { +--- a/src/utils/wpa_debug.c ++++ b/src/utils/wpa_debug.c +@@ -79,6 +79,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 ++ fflush(out_file); #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) { + if (!out_file && !wpa_debug_syslog) + printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); +@@ -230,6 +231,7 @@ void wpa_printf(int level, const char *f + va_start(ap, fmt); vfprintf(out_file, fmt, ap); fprintf(out_file, "\n"); + fflush(out_file); - } else { + va_end(ap); + } #endif /* CONFIG_DEBUG_FILE */ - vprintf(fmt, ap); -@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons +@@ -365,6 +367,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; + if (!wpa_debug_syslog && !out_file) { +@@ -468,6 +471,8 @@ static void _wpa_hexdump_ascii(int level } + } + file_done: ++ if (out_file) + fflush(out_file); - } else { #endif /* CONFIG_DEBUG_FILE */ - if (!show) { + if (!wpa_debug_syslog && !out_file) { + if (!show) { diff --git a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-openssl-more-algs.patch b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-openssl-more-algs.patch deleted file mode 100644 index cd058837c0..0000000000 --- a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-openssl-more-algs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up wpa_supplicant-0.7.3/src/crypto/tls_openssl.c.more-openssl-algs wpa_supplicant-0.7.3/src/crypto/tls_openssl.c ---- wpa_supplicant-0.7.3/src/crypto/tls_openssl.c.more-openssl-algs 2010-09-07 10:43:39.000000000 -0500 -+++ wpa_supplicant-0.7.3/src/crypto/tls_openssl.c 2010-12-08 10:01:02.967664004 -0600 -@@ -710,6 +710,11 @@ void * tls_init(const struct tls_config - #endif /* OPENSSL_FIPS */ - #endif /* CONFIG_FIPS */ - SSL_load_error_strings(); -+ /* Only add potentially weak hashes and encryption algorithms -+ * when FIPS mode is not enabled. -+ */ -+ if (!conf || !conf->fips_mode) -+ OpenSSL_add_all_algorithms(); - SSL_library_init(); - #ifndef OPENSSL_NO_SHA256 - EVP_add_digest(EVP_sha256()); diff --git a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-quiet-scan-results-message.patch b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-quiet-scan-results-message.patch index afabdf6ec8..c646a30465 100644 --- a/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-quiet-scan-results-message.patch +++ b/network/connection/wpa_supplicant/files/fedora/wpa_supplicant-quiet-scan-results-message.patch @@ -1,12 +1,30 @@ -diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_supplicant-0.6.7/wpa_supplicant/events.c ---- wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg 2009-01-30 12:08:34.000000000 -0500 -+++ wpa_supplicant-0.6.7/wpa_supplicant/events.c 2009-01-30 12:08:37.000000000 -0500 -@@ -911,7 +911,7 @@ static void wpa_supplicant_event_scan_re +From 763a4ef660e2bd81f6cdc71a2f29a0a3e71b2ebc Mon Sep 17 00:00:00 2001 +From: Dan Williams +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); } - - wpa_dbg(wpa_s, MSG_DEBUG, "New scan results available"); -- 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); - wpas_notify_scan_done(wpa_s, 1); \ No newline at end of file +-- +2.9.3 + diff --git a/network/connection/wpa_supplicant/files/mandriva/wpa_supplicant-0.6.3-WEP232.patch b/network/connection/wpa_supplicant/files/mandriva/wpa_supplicant-0.6.3-WEP232.patch deleted file mode 100644 index bbb5b8f4f6..0000000000 --- a/network/connection/wpa_supplicant/files/mandriva/wpa_supplicant-0.6.3-WEP232.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -p -up wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h.WEP232 wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h ---- wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h.WEP232 2008-02-23 03:45:24.000000000 +0100 -+++ wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h 2008-03-31 22:28:29.000000000 +0200 -@@ -189,7 +189,7 @@ struct wpa_ssid { - #endif /* IEEE8021X_EAPOL */ - - #define NUM_WEP_KEYS 4 --#define MAX_WEP_KEY_LEN 16 -+#define MAX_WEP_KEY_LEN 32 - /** - * wep_key - WEP keys - */ diff --git a/network/connection/wpa_supplicant/files/suse/wpa_supplicant-driver-wext-debug.patch b/network/connection/wpa_supplicant/files/suse/wpa_supplicant-driver-wext-debug.patch deleted file mode 100644 index 343c8168ff..0000000000 --- a/network/connection/wpa_supplicant/files/suse/wpa_supplicant-driver-wext-debug.patch +++ /dev/null @@ -1,143 +0,0 @@ -Index: src/drivers/driver_wext.c -=================================================================== ---- src/drivers/driver_wext.c.orig -+++ src/drivers/driver_wext.c -@@ -1901,19 +1901,26 @@ int wpa_driver_wext_associate(void *priv - * SIOCSIWENCODE here. - */ - if (drv->auth_alg_fallback && -- wpa_driver_wext_auth_alg_fallback(drv, params) < 0) -+ wpa_driver_wext_auth_alg_fallback(drv, params) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because auth_alg_fallback failed", __FUNCTION__); - ret = -1; -+ } - - if (!params->bssid && -- wpa_driver_wext_set_bssid(drv, NULL) < 0) -+ wpa_driver_wext_set_bssid(drv, NULL) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__); - ret = -1; -+ } - - /* TODO: should consider getting wpa version and cipher/key_mgmt suites - * from configuration, not from here, where only the selected suite is - * available */ - if (wpa_driver_wext_set_gen_ie(drv, params->wpa_ie, params->wpa_ie_len) -- < 0) -+ < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_gen_ie failed", __FUNCTION__); - ret = -1; -+ } -+ - if (params->wpa_ie == NULL || params->wpa_ie_len == 0) - value = IW_AUTH_WPA_VERSION_DISABLED; - else if (params->wpa_ie[0] == WLAN_EID_RSN) -@@ -1921,27 +1928,41 @@ int wpa_driver_wext_associate(void *priv - else - value = IW_AUTH_WPA_VERSION_WPA; - if (wpa_driver_wext_set_auth_param(drv, -- IW_AUTH_WPA_VERSION, value) < 0) -+ IW_AUTH_WPA_VERSION, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(WPA_VERSION) failed", __FUNCTION__); - ret = -1; -+ } -+ - value = wpa_driver_wext_cipher2wext(params->pairwise_suite); - if (wpa_driver_wext_set_auth_param(drv, -- IW_AUTH_CIPHER_PAIRWISE, value) < 0) -+ IW_AUTH_CIPHER_PAIRWISE, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_PAIRWISE) failed", __FUNCTION__); - ret = -1; -+ } -+ - value = wpa_driver_wext_cipher2wext(params->group_suite); - if (wpa_driver_wext_set_auth_param(drv, -- IW_AUTH_CIPHER_GROUP, value) < 0) -+ IW_AUTH_CIPHER_GROUP, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_GROUP) failed", __FUNCTION__); - ret = -1; -+ } -+ - value = wpa_driver_wext_keymgmt2wext(params->key_mgmt_suite); - if (wpa_driver_wext_set_auth_param(drv, -- IW_AUTH_KEY_MGMT, value) < 0) -+ IW_AUTH_KEY_MGMT, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__); - ret = -1; -+ } -+ - value = params->key_mgmt_suite != KEY_MGMT_NONE || - params->pairwise_suite != CIPHER_NONE || - params->group_suite != CIPHER_NONE || - params->wpa_ie_len; - if (wpa_driver_wext_set_auth_param(drv, -- IW_AUTH_PRIVACY_INVOKED, value) < 0) -+ IW_AUTH_PRIVACY_INVOKED, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(PRIVACY_INVOKED) failed", __FUNCTION__); - ret = -1; -+ } - - /* Allow unencrypted EAPOL messages even if pairwise keys are set when - * not using WPA. IEEE 802.1X specifies that these frames are not -@@ -1952,12 +1973,18 @@ int wpa_driver_wext_associate(void *priv - else - allow_unencrypted_eapol = 1; - -- if (wpa_driver_wext_set_psk(drv, params->psk) < 0) -+ if (wpa_driver_wext_set_psk(drv, params->psk) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_psk failed", __FUNCTION__); - ret = -1; -+ } -+ - if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_RX_UNENCRYPTED_EAPOL, -- allow_unencrypted_eapol) < 0) -+ allow_unencrypted_eapol) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(RX_UNENCRYPTED_EAPOL) failed", __FUNCTION__); - ret = -1; -+ } -+ - #ifdef CONFIG_IEEE80211W - switch (params->mgmt_frame_protection) { - case NO_MGMT_FRAME_PROTECTION: -@@ -1970,17 +1997,25 @@ int wpa_driver_wext_associate(void *priv - value = IW_AUTH_MFP_REQUIRED; - break; - }; -- if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) -+ if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(IW_AUTH_MFP) failed", __FUNCTION__); - ret = -1; -+ } - #endif /* CONFIG_IEEE80211W */ -- if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) -+ if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_freq failed", __FUNCTION__); - ret = -1; -+ } - if (!drv->cfg80211 && -- wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) -+ wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_ssid failed", __FUNCTION__); - ret = -1; -+ } - if (params->bssid && -- wpa_driver_wext_set_bssid(drv, params->bssid) < 0) -+ wpa_driver_wext_set_bssid(drv, params->bssid) < 0) { -+ wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__); - ret = -1; -+ } - if (drv->cfg80211 && - wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) - ret = -1; -@@ -2008,6 +2043,10 @@ static int wpa_driver_wext_set_auth_alg( - res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG, - algs); - drv->auth_alg_fallback = res == -2; -+ -+ if (res == -2) -+ wpa_printf(MSG_DEBUG, "%s: falling back to ENCODE for AUTH", __FUNCTION__); -+ - return res; - } - diff --git a/network/connection/wpa_supplicant/files/suse/wpa_supplicant-errormsg.patch b/network/connection/wpa_supplicant/files/suse/wpa_supplicant-errormsg.patch deleted file mode 100644 index f2ac0cb707..0000000000 --- a/network/connection/wpa_supplicant/files/suse/wpa_supplicant-errormsg.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: src/drivers/driver_wext.c -=================================================================== ---- src/drivers/driver_wext.c.orig -+++ src/drivers/driver_wext.c -@@ -54,12 +54,13 @@ int wpa_driver_wext_set_auth_param(struc - iwr.u.param.value = value; - - if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) { -+ int saved_errno = errno; - if (errno != EOPNOTSUPP) { - wpa_printf(MSG_DEBUG, "WEXT: SIOCSIWAUTH(param %d " - "value 0x%x) failed: %s)", - idx, value, strerror(errno)); - } -- ret = errno == EOPNOTSUPP ? -2 : -1; -+ ret = saved_errno == EOPNOTSUPP ? -2 : -1; - } - - return ret; diff --git a/network/connection/wpa_supplicant/files/ubuntu/01_use_pkg-config_for_pcsc-lite_module.patch b/network/connection/wpa_supplicant/files/ubuntu/01_use_pkg-config_for_pcsc-lite_module.patch deleted file mode 100644 index d41a507a1e..0000000000 --- a/network/connection/wpa_supplicant/files/ubuntu/01_use_pkg-config_for_pcsc-lite_module.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Reinhard Tartler -References: none -Description: Use pkg-config for libpcsclite linkage flags - At least in debian, we can rely on pkg-config being available and - returning more accurate ldflags. - ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -691,7 +691,7 @@ ifdef CONFIG_NATIVE_WINDOWS - #dynamic symbol loading that is now used in pcsc_funcs.c - #LIBS += -lwinscard - else --LIBS += -lpcsclite -lpthread -+LIBS += $(shell pkg-config --libs libpcsclite) - endif - endif - diff --git a/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch b/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch deleted file mode 100644 index bbff73e13d..0000000000 --- a/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c ---- a/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:28:37.616150164 +0000 -+++ b/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:30:21.904157611 +0000 -@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru - const struct wpa_dbus_property_desc *dsc; - int i = 0; - -- if (iface == NULL) -+ if (iface == NULL || path == NULL) - return; - - dbus_connection_get_object_path_data(iface->con, path, -diff -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c ---- a/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:28:29.502149373 +0000 -+++ b/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:30:48.859162441 +0000 -@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res - DBusMessage *_signal; - - /* Do nothing if the control interface is not turned on */ -- if (iface == NULL) -+ if (iface == NULL || wpa_s->dbus_path == NULL) - return; - - _signal = dbus_message_new_signal(wpa_s->dbus_path, -@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch - if (wpa_s->global == NULL) - return; - iface = wpa_s->global->dbus; -- if (iface == NULL) -+ if (iface == NULL || wpa_s->dbus_path == NULL) - return; - - /* Only send signal if state really changed */ -@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning - dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE; - - /* Do nothing if the control interface is not turned on */ -- if (iface == NULL) -+ if (iface == NULL || wpa_s->dbus_path == NULL) - return; - - _signal = dbus_message_new_signal(wpa_s->dbus_path, -@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred - if (wpa_s->global == NULL) - return; - iface = wpa_s->global->dbus; -- if (iface == NULL) -+ if (iface == NULL || wpa_s->dbus_path == NULL) - return; - - _signal = dbus_message_new_signal(wpa_s->dbus_path, -@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific - if (wpa_s->global == NULL) - return; - iface = wpa_s->global->dbus; -- if (iface == NULL) -+ if (iface == NULL || wpa_s->dbus_path == NULL) - return; - - _signal = dbus_message_new_signal(wpa_s->dbus_path, diff --git a/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch b/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch deleted file mode 100644 index c84e51dfde..0000000000 --- a/network/connection/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c ---- a/src/eap_peer/eap_methods.c 2012-05-15 08:23:17.151386999 +0000 -+++ b/src/eap_peer/eap_methods.c 2012-05-15 08:23:57.403389760 +0000 -@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_ - - - /** -+ * eap_peer_register_methods - Register all known EAP peer methods -+ * -+ * This function is called at program start to register all compiled -+ * in EAP peer methods. -+ */ -+int eap_peer_register_methods(void) -+{ -+ int ret = 0; -+ -+#ifdef EAP_MD5 -+ if (ret == 0) -+ ret = eap_peer_md5_register(); -+#endif /* EAP_MD5 */ -+ -+#ifdef EAP_TLS -+ if (ret == 0) -+ ret = eap_peer_tls_register(); -+#endif /* EAP_TLS */ -+ -+#ifdef EAP_MSCHAPv2 -+ if (ret == 0) -+ ret = eap_peer_mschapv2_register(); -+#endif /* EAP_MSCHAPv2 */ -+ -+#ifdef EAP_PEAP -+ if (ret == 0) -+ ret = eap_peer_peap_register(); -+#endif /* EAP_PEAP */ -+ -+#ifdef EAP_TTLS -+ if (ret == 0) -+ ret = eap_peer_ttls_register(); -+#endif /* EAP_TTLS */ -+ -+#ifdef EAP_GTC -+ if (ret == 0) -+ ret = eap_peer_gtc_register(); -+#endif /* EAP_GTC */ -+ -+#ifdef EAP_OTP -+ if (ret == 0) -+ ret = eap_peer_otp_register(); -+#endif /* EAP_OTP */ -+ -+#ifdef EAP_SIM -+ if (ret == 0) -+ ret = eap_peer_sim_register(); -+#endif /* EAP_SIM */ -+ -+#ifdef EAP_LEAP -+ if (ret == 0) -+ ret = eap_peer_leap_register(); -+#endif /* EAP_LEAP */ -+ -+#ifdef EAP_PSK -+ if (ret == 0) -+ ret = eap_peer_psk_register(); -+#endif /* EAP_PSK */ -+ -+#ifdef EAP_AKA -+ if (ret == 0) -+ ret = eap_peer_aka_register(); -+#endif /* EAP_AKA */ -+ -+#ifdef EAP_AKA_PRIME -+ if (ret == 0) -+ ret = eap_peer_aka_prime_register(); -+#endif /* EAP_AKA_PRIME */ -+ -+#ifdef EAP_FAST -+ if (ret == 0) -+ ret = eap_peer_fast_register(); -+#endif /* EAP_FAST */ -+ -+#ifdef EAP_PAX -+ if (ret == 0) -+ ret = eap_peer_pax_register(); -+#endif /* EAP_PAX */ -+ -+#ifdef EAP_SAKE -+ if (ret == 0) -+ ret = eap_peer_sake_register(); -+#endif /* EAP_SAKE */ -+ -+#ifdef EAP_GPSK -+ if (ret == 0) -+ ret = eap_peer_gpsk_register(); -+#endif /* EAP_GPSK */ -+ -+#ifdef EAP_WSC -+ if (ret == 0) -+ ret = eap_peer_wsc_register(); -+#endif /* EAP_WSC */ -+ -+#ifdef EAP_IKEV2 -+ if (ret == 0) -+ ret = eap_peer_ikev2_register(); -+#endif /* EAP_IKEV2 */ -+ -+#ifdef EAP_VENDOR_TEST -+ if (ret == 0) -+ ret = eap_peer_vendor_test_register(); -+#endif /* EAP_VENDOR_TEST */ -+ -+#ifdef EAP_TNC -+ if (ret == 0) -+ ret = eap_peer_tnc_register(); -+#endif /* EAP_TNC */ -+ -+ return ret; -+} -+ -+ -+/** - * eap_peer_unregister_methods - Unregister EAP peer methods - * - * This function is called at program termination to unregister all EAP peer -diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h ---- a/src/eap_peer/eap_methods.h 2012-05-15 08:23:17.151386999 +0000 -+++ b/src/eap_peer/eap_methods.h 2012-05-15 08:23:57.404389735 +0000 -@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na - const char * eap_get_name(int vendor, EapType type); - size_t eap_get_names(char *buf, size_t buflen); - char ** eap_get_names_as_string_array(size_t *num); -+int eap_peer_register_methods(void); - void eap_peer_unregister_methods(void); - - #else /* IEEE8021X_EAPOL */ -diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc ---- a/src/eap_peer/libeap0.pc 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/eap_peer/libeap0.pc 2012-05-15 08:23:57.404389735 +0000 -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=/usr -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include/eap_peer -+ -+Name: libeap0 -+Description: EAP Peer Library API -+Version: 0.7.2 -+Libs: -L${libdir} -leap -+Cflags: -I${includedir} -diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile ---- a/src/eap_peer/Makefile 2012-05-15 08:23:17.152386964 +0000 -+++ b/src/eap_peer/Makefile 2012-05-15 08:23:57.403389760 +0000 -@@ -1,11 +1,186 @@ --all: -- @echo Nothing to be made. -+LIBEAP_NAME = libeap -+LIBEAP_CURRENT = 0 -+LIBEAP_REVISION = 0 -+LIBEAP_AGE = 0 -+ -+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE) -+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT) -+ -+.PHONY: all clean install uninstall -+ -+all: $(LIBEAP) -+ -+ifndef CC -+CC=gcc -+endif -+ -+ifndef CFLAGS -+CFLAGS = -MMD -O0 -Wall -g -+endif -+ -+CONFIG_TLS=openssl -+ -+INCLUDE_INSTALL_DIR=/usr/include/eap_peer -+ -+# Got to use override all across the board, otherwise a 'make -+# CFLAGS=XX' will kill us because the command line's CFLAGS will -+# overwrite Make's and we'll loose all the infrastructure it sets. -+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common -+ -+# at least for now, need to include config_ssid.h and config_blob.h from -+# wpa_supplicant directory -+override CFLAGS += -I ../../wpa_supplicant -+ -+OBJS_both += ../utils/common.o -+OBJS_both += ../utils/os_unix.o -+OBJS_both += ../utils/wpa_debug.o -+OBJS_both += ../utils/base64.o -+OBJS_both += ../utils/wpabuf.o -+OBJS_both += ../crypto/md5.o -+OBJS_both += ../crypto/sha1.o -+OBJS_both += ../crypto/sha1-tlsprf.o -+OBJS_both += ../crypto/aes-encblock.o -+OBJS_both += ../crypto/aes-wrap.o -+OBJS_both += ../crypto/aes-ctr.o -+OBJS_both += ../crypto/aes-eax.o -+OBJS_both += ../crypto/aes-omac1.o -+OBJS_both += ../crypto/ms_funcs.o -+OBJS_both += ../crypto/sha256.o -+ -+ -+OBJS_both += ../eap_common/eap_peap_common.o -+OBJS_both += ../eap_common/eap_psk_common.o -+OBJS_both += ../eap_common/eap_pax_common.o -+OBJS_both += ../eap_common/eap_sake_common.o -+OBJS_both += ../eap_common/eap_gpsk_common.o -+OBJS_both += ../eap_common/chap.o -+ -+OBJS_peer += ../eap_peer/eap_tls.o -+OBJS_peer += ../eap_peer/eap_peap.o -+OBJS_peer += ../eap_peer/eap_ttls.o -+OBJS_peer += ../eap_peer/eap_md5.o -+OBJS_peer += ../eap_peer/eap_mschapv2.o -+OBJS_peer += ../eap_peer/mschapv2.o -+OBJS_peer += ../eap_peer/eap_otp.o -+OBJS_peer += ../eap_peer/eap_gtc.o -+OBJS_peer += ../eap_peer/eap_leap.o -+OBJS_peer += ../eap_peer/eap_psk.o -+OBJS_peer += ../eap_peer/eap_pax.o -+OBJS_peer += ../eap_peer/eap_sake.o -+OBJS_peer += ../eap_peer/eap_gpsk.o -+OBJS_peer += ../eap_peer/eap.o -+OBJS_peer += ../eap_common/eap_common.o -+OBJS_peer += ../eap_peer/eap_methods.o -+OBJS_peer += ../eap_peer/eap_tls_common.o -+ -+override CFLAGS += -DEAP_TLS -+override CFLAGS += -DEAP_PEAP -+override CFLAGS += -DEAP_TTLS -+override CFLAGS += -DEAP_MD5 -+override CFLAGS += -DEAP_MSCHAPv2 -+override CFLAGS += -DEAP_GTC -+override CFLAGS += -DEAP_OTP -+override CFLAGS += -DEAP_LEAP -+override CFLAGS += -DEAP_PSK -+override CFLAGS += -DEAP_PAX -+override CFLAGS += -DEAP_SAKE -+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 -+override CFLAGS += -DEAP_TLS_FUNCS -+ -+override CFLAGS += -DIEEE8021X_EAPOL -+ -+ifeq ($(CONFIG_TLS), openssl) -+override CFLAGS += -DEAP_TLS_OPENSSL -+OBJS_both += ../crypto/tls_openssl.o -+OBJS_both += ../crypto/crypto_openssl.o -+LIBS += -lssl -lcrypto -+override CFLAGS += -DINTERNAL_SHA256 -+endif -+ -+ifeq ($(CONFIG_TLS), internal) -+OBJS_both += ../crypto/tls_internal.o -+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o -+OBJS_both += ../tls/tlsv1_cred.o -+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o -+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o -+ -+OBJS_peer += ../tls/tlsv1_client.o -+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT -+ -+OBJS_server += ../tls/tlsv1_server.o -+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER -+ -+override CFLAGS += -DCONFIG_TLS_INTERNAL -+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL -+override CFLAGS += -DCONFIG_INTERNAL_X509 -+override CFLAGS += -DINTERNAL_AES -+override CFLAGS += -DINTERNAL_SHA1 -+override CFLAGS += -DINTERNAL_SHA256 -+override CFLAGS += -DINTERNAL_MD5 -+override CFLAGS += -DINTERNAL_MD4 -+override CFLAGS += -DINTERNAL_DES -+ifdef CONFIG_INTERNAL_LIBTOMMATH -+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH -+else -+LIBS += -ltommath -+endif -+endif -+ -+ifndef LDO -+LDO=$(CC) -+endif -+ -+ -+OBJS_lib=$(OBJS_both) $(OBJS_peer) -+ -+ #$(OBJS_server) -+ -+override CFLAGS += -fPIC -DPIC -+LDFLAGS += -shared -+ -+$(LIBEAP): $(OBJS_lib) -+ $(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS) -+ -+ -+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \ -+ ../utils/wpabuf.h ../utils/build_config.h \ -+ ../utils/os.h ../utils/wpa_debug.h -+COMMON_HEADERS = ../common/defs.h -+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h -+MAIN_HEADERS = eap.h eap_methods.h eap_config.h -+CRYPTO_HEADERS = ../crypto/tls.h -+ -+install: -+ -+ mkdir -p $(DESTDIR)/usr/lib -+# copy the lib file to std lib location -+ cp $(LIBEAP) $(DESTDIR)/usr/lib -+ ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so -+ ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0 -+ -+# copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include -+ mkdir -p \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common -+ install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common -+ install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util -+ install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/ -+ -+ mkdir -p $(DESTDIR)/usr/lib/pkgconfig -+ cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig -+ -+uninstall: -+ -+ rm $(DESTDIR)/usr/lib/$(LIBEAP) -+ rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR) -+ rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc - - clean: -- rm -f *~ *.o *.so *.d -+ rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib) - --install: -- if ls *.so >/dev/null 2>&1; then \ -- install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \ -- cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \ -- ; fi diff --git a/network/connection/wpa_supplicant/files/wpa_supplicant.config b/network/connection/wpa_supplicant/files/wpa_supplicant.config index e95469fe2b..f30934f111 100644 --- a/network/connection/wpa_supplicant/files/wpa_supplicant.config +++ b/network/connection/wpa_supplicant/files/wpa_supplicant.config @@ -8,6 +8,7 @@ CONFIG_DRIVER_ATMEL=y CONFIG_DRIVER_WEXT=y CONFIG_DRIVER_NL80211=y + CONFIG_DRIVER_NL80211_QCA=y CONFIG_DRIVER_NDISWRAPPER=y #CONFIG_DRIVER_PRISM54=y CONFIG_DRIVER_WIRED=y @@ -30,7 +31,7 @@ CONFIG_EAP_PSK=y CONFIG_EAP_PAX=y CONFIG_EAP_LEAP=y - #CONFIG_PCSC=y + CONFIG_PCSC=y CONFIG_EAP_SAKE=y CONFIG_EAP_GPSK=y CONFIG_EAP_GPSK_SHA256=y @@ -44,4 +45,66 @@ CONFIG_IPV6=y CONFIG_LIBNL32=y CONFIG_PEERKEY=y - CONFIG_READLINE=y \ No newline at end of file + CONFIG_READLINE=y + + CONFIG_ELOOP=eloop + CONFIG_AUTOSCAN_EXPONENTIAL=y + CONFIG_AUTOSCAN_PERIODIC=y + CONFIG_FST=y + CONFIG_ACS=y + CONFIG_OCV=y + #CONFIG_MBO=y + CONFIG_FILS=y + CONFIG_FILS_SK_PFS=y + CONFIG_SUITEB=y + CONFIG_SUITEB192=y + CONFIG_IEEE80211W=y + CONFIG_IEEE80211N=y + + CONFIG_GETRANDOM=y + CONFIG_MESH=y + CONFIG_OWE=y + + #CONFIG_DRIVER_MACSEC_QCA=y + CONFIG_DRIVER_MACSEC_LINUX=y + CONFIG_DRIVER_NONE=y + CONFIG_EAP_PWD=y + CONFIG_EAP_AKA_PRIME=y + CONFIG_WPS_ER=y + CONFIG_WPS_REG_DISABLE_OPEN=y + CONFIG_WPS_NFC=y + CONFIG_EAP_EKE=y + CONFIG_MACSEC=y + CONFIG_HT_OVERRIDES=y + CONFIG_VHT_OVERRIDES=y + CONFIG_EAPOL_TEST=y + CONFIG_SAE=y + CONFIG_BACKEND=file + CONFIG_MAIN=main + CONFIG_OS=unix + CONFIG_L2_PACKET=linux + CONFIG_TLS=openssl + CONFIG_TLSV11=y + CONFIG_TLSV12=y + CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT@SECLEVEL=1" + CONFIG_IEEE80211R=y + CONFIG_DEBUG_SYSLOG=y + CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + CONFIG_DEBUG_LINUX_TRACING=y + CONFIG_DELAYED_MIC_ERROR_REPORT=y + CONFIG_NO_RANDOM_POOL=y + CONFIG_IEEE80211AC=y + CONFIG_WNM=y + CONFIG_INTERWORKING=y + CONFIG_HS20=y + CONFIG_AP=y + CONFIG_P2P=y + CONFIG_TDLS=y + CONFIG_WIFI_DISPLAY=y + CONFIG_IBSS_RSN=y + CONFIG_PMKSA_CACHE_EXTERNAL=y + CONFIG_BGSCAN_SIMPLE=y + CONFIG_BGSCAN_LEARN=y + CONFIG_DPP=y + CONFIG_DPP2=y + CONFIG_WEP=y diff --git a/network/connection/wpa_supplicant/pspec.xml b/network/connection/wpa_supplicant/pspec.xml index 685659ba80..cf65d1208b 100644 --- a/network/connection/wpa_supplicant/pspec.xml +++ b/network/connection/wpa_supplicant/pspec.xml @@ -13,7 +13,7 @@ service IEEE 802.1X/WPA supplicant for secure wireless transfers wpa_supplicant is a WPA supplicant with support for WPA and WPA2. - https://w1.fi/releases/wpa_supplicant-2.9.tar.gz + https://w1.fi/releases/wpa_supplicant-2.10.tar.gz wpa_supplicant.config @@ -24,27 +24,15 @@ readline-devel - 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch - - ubuntu/01_use_pkg-config_for_pcsc-lite_module.patch - - wpa_supplicant-1.0-dbus-path-fix.patch - - mandriva/wpa_supplicant-0.6.3-WEP232.patch - fedora/wpa_supplicant-openssl-more-algs.patch - fedora/wpa_supplicant-flush-debug-output.patch - - - fedora/wpa_supplicant-assoc-timeout.patch - - - - suse/wpa_supplicant-errormsg.patch - - - - - + fedora/wpa_supplicant-allow-legacy-renegotiation.patch + fedora/wpa_supplicant-assoc-timeout.patch + + + + + fedora/wpa_supplicant-flush-debug-output.patch + fedora/wpa_supplicant-quiet-scan-results-message.patch + wpa_supplicant-1.0-dbus-path-fix.patch @@ -83,6 +71,13 @@ + + 2022-12-29 + 2.10 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-07-02 2.9