From: nbd Date: Thu, 1 Sep 2011 16:08:17 +0000 (+0000) Subject: Revert "hostapd: add a patch for ignoring the WPA/WPA2 key type to work around some... X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=26a85b29512cbc1f0eff62870aac585d047d1d3c Revert "hostapd: add a patch for ignoring the WPA/WPA2 key type to work around some broken clients (#9561, backport of r28111)" This is causing regressions for other clients git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28142 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/hostapd/patches/570-eapol_key_type.patch b/package/hostapd/patches/570-eapol_key_type.patch deleted file mode 100644 index e608f1092..000000000 --- a/package/hostapd/patches/570-eapol_key_type.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -725,6 +725,7 @@ void wpa_receive(struct wpa_authenticato - return; - } - -+#if 0 - if (sm->wpa == WPA_VERSION_WPA2) { - if (key->type != EAPOL_KEY_TYPE_RSN) { - wpa_printf(MSG_DEBUG, "Ignore EAPOL-Key with " -@@ -740,6 +741,7 @@ void wpa_receive(struct wpa_authenticato - return; - } - } -+#endif - - wpa_hexdump(MSG_DEBUG, "WPA: Received Key Nonce", key->key_nonce, - WPA_NONCE_LEN); diff --git a/package/hostapd/patches/770-group_key_timeout.patch b/package/hostapd/patches/770-group_key_timeout.patch index 3f0bfc33d..a41a89bed 100644 --- a/package/hostapd/patches/770-group_key_timeout.patch +++ b/package/hostapd/patches/770-group_key_timeout.patch @@ -1,6 +1,6 @@ --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c -@@ -1290,7 +1290,7 @@ static void wpa_send_eapol(struct wpa_au +@@ -1288,7 +1288,7 @@ static void wpa_send_eapol(struct wpa_au keyidx, encr, 0); ctr = pairwise ? sm->TimeoutCtr : sm->GTimeoutCtr;