diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
commit | 3ad1877dd2575b9788137cf1f6d6e08f64b2c394 (patch) | |
tree | 6152a8d66dd59100d19d70d520a282c5235efb70 /package/hostapd/patches/570-wpa_ie_cap_workaround.patch | |
parent | 1ef62d9b86e0fbe683b3558e1c21dbf92bd80632 (diff) | |
download | master-187ad058-3ad1877dd2575b9788137cf1f6d6e08f64b2c394.tar.gz master-187ad058-3ad1877dd2575b9788137cf1f6d6e08f64b2c394.tar.bz2 master-187ad058-3ad1877dd2575b9788137cf1f6d6e08f64b2c394.zip |
hostapd: update to 20120326
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31080 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/570-wpa_ie_cap_workaround.patch')
-rw-r--r-- | package/hostapd/patches/570-wpa_ie_cap_workaround.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/package/hostapd/patches/570-wpa_ie_cap_workaround.patch b/package/hostapd/patches/570-wpa_ie_cap_workaround.patch deleted file mode 100644 index 00a32229d4..0000000000 --- a/package/hostapd/patches/570-wpa_ie_cap_workaround.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/src/common/wpa_common.c -+++ b/src/common/wpa_common.c -@@ -959,6 +959,31 @@ const char * wpa_key_mgmt_txt(int key_mg - } - - -+static void wpa_fixup_wpa_ie_rsn(u8 *assoc_ie, const u8 *wpa_msg_ie, -+ size_t rsn_ie_len) -+{ -+ int pos, count; -+ -+ pos = sizeof(struct rsn_ie_hdr) + RSN_SELECTOR_LEN; -+ if (rsn_ie_len < pos + 2) -+ return; -+ -+ count = WPA_GET_LE16(wpa_msg_ie + pos); -+ pos += 2 + count * RSN_SELECTOR_LEN; -+ if (rsn_ie_len < pos + 2) -+ return; -+ -+ count = WPA_GET_LE16(wpa_msg_ie + pos); -+ pos += 2 + count * RSN_SELECTOR_LEN; -+ if (rsn_ie_len < pos + 2) -+ return; -+ -+ if (!assoc_ie[pos] && !assoc_ie[pos + 1] && -+ (wpa_msg_ie[pos] || wpa_msg_ie[pos + 1])) -+ memcpy(&assoc_ie[pos], &wpa_msg_ie[pos], 2); -+} -+ -+ - int wpa_compare_rsn_ie(int ft_initial_assoc, - const u8 *ie1, size_t ie1len, - const u8 *ie2, size_t ie2len) -@@ -966,8 +991,19 @@ int wpa_compare_rsn_ie(int ft_initial_as - if (ie1 == NULL || ie2 == NULL) - return -1; - -- if (ie1len == ie2len && os_memcmp(ie1, ie2, ie1len) == 0) -- return 0; /* identical IEs */ -+ if (ie1len == ie2len) { -+ u8 *ie_tmp; -+ -+ if (os_memcmp(ie1, ie2, ie1len) == 0) -+ return 0; /* identical IEs */ -+ -+ ie_tmp = alloca(ie1len); -+ memcpy(ie_tmp, ie1, ie1len); -+ wpa_fixup_wpa_ie_rsn(ie_tmp, ie2, ie1len); -+ -+ if (os_memcmp(ie_tmp, ie2, ie1len) == 0) -+ return 0; /* only mismatch in RSN capabilties */ -+ } - - #ifdef CONFIG_IEEE80211R - if (ft_initial_assoc) { |