diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-11-25 15:43:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-11-25 15:43:15 +0000 |
| commit | 5d000ddd9e970237c8ae823e83ee9e5c63ebeadb (patch) | |
| tree | 11e79902b11c32d7e2186f6a5257cea2ce53d14a /package/network/services/hostapd/patches/100-madwifi_key_fixes.patch | |
| parent | 77bba4261a68be8fabafe35c317ad1333f74318c (diff) | |
| download | master-187ad058-5d000ddd9e970237c8ae823e83ee9e5c63ebeadb.tar.gz master-187ad058-5d000ddd9e970237c8ae823e83ee9e5c63ebeadb.tar.bz2 master-187ad058-5d000ddd9e970237c8ae823e83ee9e5c63ebeadb.zip | |
hostapd: update to version 2013-11-20
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38914 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/patches/100-madwifi_key_fixes.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/100-madwifi_key_fixes.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch b/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch new file mode 100644 index 0000000000..dcd6d10bd6 --- /dev/null +++ b/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch @@ -0,0 +1,34 @@ +--- a/src/drivers/driver_madwifi.c ++++ b/src/drivers/driver_madwifi.c +@@ -450,7 +450,9 @@ wpa_driver_madwifi_set_key(const char *i + + memset(&wk, 0, sizeof(wk)); + wk.ik_type = cipher; +- wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT; ++ wk.ik_flags = IEEE80211_KEY_RECV; ++ if (set_tx) ++ wk.ik_flags |= IEEE80211_KEY_XMIT; + if (addr == NULL || is_broadcast_ether_addr(addr)) { + memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN); + wk.ik_keyix = key_idx; +@@ -462,6 +464,20 @@ wpa_driver_madwifi_set_key(const char *i + wk.ik_keylen = key_len; + memcpy(wk.ik_keydata, key, key_len); + ++#ifdef WORDS_BIGENDIAN ++#define WPA_KEY_RSC_LEN 8 ++ { ++ size_t i; ++ u8 tmp[WPA_KEY_RSC_LEN]; ++ os_memset(tmp, 0, sizeof(tmp)); ++ for (i = 0; i < seq_len; i++) ++ tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i]; ++ os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN); ++ } ++#else /* WORDS_BIGENDIAN */ ++ os_memcpy(&wk.ik_keyrsc, seq, seq_len); ++#endif /* WORDS_BIGENDIAN */ ++ + ret = set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk)); + if (ret < 0) { + wpa_printf(MSG_DEBUG, "%s: Failed to set key (addr %s" |