- Update to latest upstream release
This commit is contained in:
Daniel Williams
parent
3b7817c7cc
commit
6f5c0a590b
@ -8,3 +8,4 @@ wpa_supplicant-0.5.7.tar.gz
|
||||
wpa_supplicant-0.6.3.tar.gz
|
||||
wpa_supplicant-0.6.4.tar.gz
|
||||
wpa_supplicant-0.6.7.tar.gz
|
||||
wpa_supplicant-0.6.8.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
b61f6e94b63f92173f4286b5e6a84140 wpa_supplicant-0.6.7.tar.gz
|
||||
e933332490e0e5acfef2279457f1070a wpa_supplicant-0.6.8.tar.gz
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
|
||||
index 631c63d..fb9d5c6 100644
|
||||
--- a/src/drivers/driver_wext.c
|
||||
+++ b/src/drivers/driver_wext.c
|
||||
@@ -1911,9 +1911,24 @@ static int wpa_driver_wext_disassociate(void *priv, const u8 *addr,
|
||||
int reason_code)
|
||||
{
|
||||
struct wpa_driver_wext_data *drv = priv;
|
||||
+ u8 ssid[32];
|
||||
+ int ret;
|
||||
+
|
||||
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
|
||||
- return wpa_driver_wext_mlme(drv, addr, IW_MLME_DISASSOC,
|
||||
- reason_code);
|
||||
+
|
||||
+ ret = wpa_driver_wext_mlme(drv, addr, IW_MLME_DISASSOC,
|
||||
+ reason_code);
|
||||
+ if (ret == 0) {
|
||||
+ const u8 null_bssid[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
|
||||
+
|
||||
+ ret = wpa_driver_wext_set_bssid(drv, null_bssid);
|
||||
+
|
||||
+ for (ret = 0; ret < 32; ret++)
|
||||
+ ssid[ret] = rand() & 0xFF;
|
||||
+ ret = wpa_driver_wext_set_ssid(drv, ssid, 32);
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
diff -up wpa_supplicant-0.6.4/src/drivers/driver_wext.c.use-IW_ENCODE_TEMP wpa_supplicant-0.6.4/src/drivers/driver_wext.c
|
||||
--- wpa_supplicant-0.6.4/src/drivers/driver_wext.c.use-IW_ENCODE_TEMP 2008-08-10 13:33:12.000000000 -0400
|
||||
+++ wpa_supplicant-0.6.4/src/drivers/driver_wext.c 2008-08-27 17:22:06.000000000 -0400
|
||||
@@ -1836,6 +1836,7 @@ static int wpa_driver_wext_set_key_ext(v
|
||||
os_memset(&iwr, 0, sizeof(iwr));
|
||||
os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.encoding.flags = key_idx + 1;
|
||||
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
|
||||
if (alg == WPA_ALG_NONE)
|
||||
iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
|
||||
iwr.u.encoding.pointer = (caddr_t) ext;
|
||||
@@ -1967,6 +1968,7 @@ int wpa_driver_wext_set_key(void *priv,
|
||||
os_memset(&iwr, 0, sizeof(iwr));
|
||||
os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.encoding.flags = key_idx + 1;
|
||||
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
|
||||
if (alg == WPA_ALG_NONE)
|
||||
iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
|
||||
iwr.u.encoding.pointer = (caddr_t) key;
|
||||
@@ -1981,6 +1983,7 @@ int wpa_driver_wext_set_key(void *priv,
|
||||
os_memset(&iwr, 0, sizeof(iwr));
|
||||
os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.encoding.flags = key_idx + 1;
|
||||
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
|
||||
iwr.u.encoding.pointer = (caddr_t) NULL;
|
||||
iwr.u.encoding.length = 0;
|
||||
if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
|
||||
@ -1,51 +0,0 @@
|
||||
commit 42f1ee7d1fae8a67a2a48adfda19f9aafc3fef32
|
||||
Author: Jouni Malinen <jouni.malinen@atheros.com>
|
||||
Date: Thu Feb 5 12:00:23 2009 +0200
|
||||
|
||||
Fixed scan buffer increasing with WEXT
|
||||
|
||||
We can now handle up to 65535 byte result buffer which is the maximum
|
||||
due to WEXT using 16-bit length field. Previously, this was limited to
|
||||
32768 bytes in practice even through we tried with 65536 and 131072
|
||||
buffers which we just truncated into 0 in the 16-bit variable.
|
||||
|
||||
This more or less doubles the number of BSSes we can received from scan
|
||||
results.
|
||||
|
||||
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
|
||||
index 5e40cd2..2646270 100644
|
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -1565,10 +1565,12 @@ static u8 * wpa_driver_nl80211_giwscan(struct wpa_driver_nl80211_data *drv,
|
||||
if (ioctl(drv->ioctl_sock, SIOCGIWSCAN, &iwr) == 0)
|
||||
break;
|
||||
|
||||
- if (errno == E2BIG && res_buf_len < 100000) {
|
||||
+ if (errno == E2BIG && res_buf_len < 65535) {
|
||||
os_free(res_buf);
|
||||
res_buf = NULL;
|
||||
res_buf_len *= 2;
|
||||
+ if (res_buf_len > 65535)
|
||||
+ res_buf_len = 65535; /* 16-bit length field */
|
||||
wpa_printf(MSG_DEBUG, "Scan results did not fit - "
|
||||
"trying larger buffer (%lu bytes)",
|
||||
(unsigned long) res_buf_len);
|
||||
diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
|
||||
index b6273e5..631c63d 100644
|
||||
--- a/src/drivers/driver_wext.c
|
||||
+++ b/src/drivers/driver_wext.c
|
||||
@@ -1140,10 +1140,12 @@ static u8 * wpa_driver_wext_giwscan(struct wpa_driver_wext_data *drv,
|
||||
if (ioctl(drv->ioctl_sock, SIOCGIWSCAN, &iwr) == 0)
|
||||
break;
|
||||
|
||||
- if (errno == E2BIG && res_buf_len < 100000) {
|
||||
+ if (errno == E2BIG && res_buf_len < 65535) {
|
||||
os_free(res_buf);
|
||||
res_buf = NULL;
|
||||
res_buf_len *= 2;
|
||||
+ if (res_buf_len > 65535)
|
||||
+ res_buf_len = 65535; /* 16-bit length field */
|
||||
wpa_printf(MSG_DEBUG, "Scan results did not fit - "
|
||||
"trying larger buffer (%lu bytes)",
|
||||
(unsigned long) res_buf_len);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Summary: WPA/WPA2/IEEE 802.1X Supplicant
|
||||
Name: wpa_supplicant
|
||||
Epoch: 1
|
||||
Version: 0.6.7
|
||||
Release: 4%{?dist}
|
||||
Version: 0.6.8
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: System Environment/Base
|
||||
Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
|
||||
@ -15,11 +15,8 @@ Source6: %{name}.logrotate
|
||||
Patch0: wpa_supplicant-assoc-timeout.patch
|
||||
Patch1: wpa_supplicant-0.5.7-qmake-location.patch
|
||||
Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch
|
||||
Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
|
||||
Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch
|
||||
Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
|
||||
Patch6: wpa-supplicant-0.6.7-really-disassoc.patch
|
||||
Patch7: wpa_supplicant-0.6.7-wext-scan-size.patch
|
||||
# Upstream: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=c3f5b1e16d119392ec30e3b5a0d015ee2aa3d664;hp=02a89365abba33fb462f739c325dc9cc3e847dae#patch1
|
||||
Patch8: wpa_supplicant-0.6.7-no-unrequested-reply.patch
|
||||
|
||||
@ -52,11 +49,8 @@ Graphical User Interface for wpa_supplicant written using QT3
|
||||
%patch0 -p1 -b .assoc-timeout
|
||||
%patch1 -p1 -b .qmake-location
|
||||
%patch2 -p1 -b .flush-debug-output
|
||||
%patch3 -p1 -b .use-IW_ENCODE_TEMP
|
||||
%patch4 -p1 -b .dbus-service-file
|
||||
%patch5 -p1 -b .quiet-scan-results-msg
|
||||
%patch6 -p1 -b .really-disassociate
|
||||
%patch7 -p1 -b .lots-o-scan-results
|
||||
%patch8 -p1 -b .no-unrequested-reply
|
||||
|
||||
%build
|
||||
@ -148,6 +142,9 @@ fi
|
||||
%{_bindir}/wpa_gui
|
||||
|
||||
%changelog
|
||||
* Mon Mar 9 2009 Dan Williams <dcbw@redhat.com> - 1:0.6.8-1
|
||||
- Update to latest upstream release
|
||||
|
||||
* Wed Feb 25 2009 Colin Walters <walters@verbum.org> - 1:0.6.7-4
|
||||
- Add patch from upstream to suppress unrequested replies, this
|
||||
quiets a dbus warning.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user