X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a6e86dfede9e41ca29aba09133236a5fa8c885b3..31a40f97ef54e10e2b3dc3cacb9cff436657c586:/package/hostapd/patches/340-madwifi_key_fixes.patch?ds=inline

diff --git a/package/hostapd/patches/340-madwifi_key_fixes.patch b/package/hostapd/patches/340-madwifi_key_fixes.patch
index d6883ffce..ab4d0575e 100644
--- a/package/hostapd/patches/340-madwifi_key_fixes.patch
+++ b/package/hostapd/patches/340-madwifi_key_fixes.patch
@@ -1,33 +1,54 @@
 --- a/src/drivers/driver_madwifi.c
 +++ b/src/drivers/driver_madwifi.c
-@@ -438,9 +438,11 @@ madwifi_set_key(const char *ifname, void
- 	wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%s key_idx=%d",
+@@ -439,7 +439,11 @@ madwifi_set_key(const char *ifname, void
  		   __func__, alg, ether_sprintf(addr), key_idx);
  
--	if (alg == WPA_ALG_WEP)
-+	if (alg == WPA_ALG_WEP) {
+ 	if (alg == WPA_ALG_WEP)
++	{
  		cipher = IEEE80211_CIPHER_WEP;
--	else if (alg == WPA_ALG_TKIP)
-+		if (!addr || !memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN))
++		if ((!addr || !memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) && drv->wext)
 +			return wpa_driver_wext_set_key(ifname, drv->wext, alg, addr, key_idx, set_tx, seq, seq_len, key, key_len);
-+	} else if (alg == WPA_ALG_TKIP)
++	}
+ 	else if (alg == WPA_ALG_TKIP)
  		cipher = IEEE80211_CIPHER_TKIP;
  	else if (alg == WPA_ALG_CCMP)
- 		cipher = IEEE80211_CIPHER_AES_CCM;
-@@ -464,15 +466,30 @@ madwifi_set_key(const char *ifname, void
- 		memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
+@@ -458,20 +462,45 @@ madwifi_set_key(const char *ifname, void
+ 
+ 	memset(&wk, 0, sizeof(wk));
+ 	wk.ik_type = cipher;
+-	wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT;
+-	if (addr == NULL || is_broadcast_ether_addr(addr)) {
+-		memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
++	wk.ik_flags = IEEE80211_KEY_RECV;
++	if (set_tx)
++		wk.ik_flags |= IEEE80211_KEY_XMIT;
++	if (addr == NULL) {
++		os_memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
  		wk.ik_keyix = key_idx;
- 		wk.ik_flags |= IEEE80211_KEY_DEFAULT;
-+		wk.ik_flags |= IEEE80211_KEY_GROUP;
- 	} else if (!memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) {
-+		wk.ik_keyix = key_idx;
- 		wk.ik_flags |= IEEE80211_KEY_GROUP;
+-		wk.ik_flags |= IEEE80211_KEY_DEFAULT;
+-	} else if (!memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) {
+-		wk.ik_flags |= IEEE80211_KEY_GROUP;
 -		memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
-+		memset(wk.ik_macaddr, 0, IEEE80211_ADDR_LEN);
  	} else {
- 		memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
- 		wk.ik_keyix = IEEE80211_KEYIX_NONE;
+-		memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
+-		wk.ik_keyix = IEEE80211_KEYIX_NONE;
++		os_memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
++		/*
++		 * Deduce whether group/global or unicast key by checking
++		 * the address (yech).  Note also that we can only mark global
++		 * keys default; doing this for a unicast key is an error.
++		 */
++		if (os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
++			      IEEE80211_ADDR_LEN) == 0) {
++			wk.ik_flags |= IEEE80211_KEY_GROUP;
++			wk.ik_keyix = key_idx;
++		} else {
++			wk.ik_keyix = key_idx == 0 ? IEEE80211_KEYIX_NONE :
++				key_idx;
++		}
  	}
++	if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
++		wk.ik_flags |= IEEE80211_KEY_DEFAULT;
  	wk.ik_keylen = key_len;
  	memcpy(wk.ik_keydata, key, key_len);
 +#ifdef WORDS_BIGENDIAN