Changeset 29876


Ignore:
Timestamp:
2012-01-24T02:49:23+01:00 (6 years ago)
Author:
nbd
Message:

hostapd: merge an upstream workaround for broken clients sending the wrong wpa type (should fix #9561)

Location:
trunk/package/hostapd/patches
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/hostapd/patches/100-pending_work.patch

    r28746 r29876  
    161161        if (bss != &drv->first_bss) { 
    162162                struct i802_bss *tbss; 
     163--- a/src/ap/wpa_auth.c 
     164+++ b/src/ap/wpa_auth.c 
     165@@ -776,7 +776,14 @@ void wpa_receive(struct wpa_authenticato 
     166        } 
     167  
     168        if (sm->wpa == WPA_VERSION_WPA2) { 
     169-               if (key->type != EAPOL_KEY_TYPE_RSN) { 
     170+               if (key->type == EAPOL_KEY_TYPE_WPA) { 
     171+                       /* 
     172+                        * Some deployed station implementations seem to send 
     173+                        * msg 4/4 with incorrect type value in WPA2 mode. 
     174+                        */ 
     175+                       wpa_printf(MSG_DEBUG, "Workaround: Allow EAPOL-Key " 
     176+                                  "with unexpected WPA type in RSN mode"); 
     177+               } else if (key->type != EAPOL_KEY_TYPE_RSN) { 
     178                        wpa_printf(MSG_DEBUG, "Ignore EAPOL-Key with " 
     179                                   "unexpected type %d in RSN mode", 
     180                                   key->type); 
  • trunk/package/hostapd/patches/560-disable_ctrl_iface_mib.patch

    r28746 r29876  
    124124--- a/src/ap/wpa_auth.c 
    125125+++ b/src/ap/wpa_auth.c 
    126 @@ -2534,6 +2534,7 @@ static int wpa_cipher_bits(int cipher) 
     126@@ -2541,6 +2541,7 @@ static int wpa_cipher_bits(int cipher) 
    127127        } 
    128128 } 
     
    132132 #define RSN_SUITE "%02x-%02x-%02x-%d" 
    133133 #define RSN_SUITE_ARG(s) \ 
    134 @@ -2697,7 +2698,7 @@ int wpa_get_mib_sta(struct wpa_state_mac 
     134@@ -2704,7 +2705,7 @@ int wpa_get_mib_sta(struct wpa_state_mac 
    135135  
    136136        return len; 
  • trunk/package/hostapd/patches/740-group_key_timeout.patch

    r28746 r29876  
    11--- a/src/ap/wpa_auth.c 
    22+++ b/src/ap/wpa_auth.c 
    3 @@ -1330,7 +1330,7 @@ static void wpa_send_eapol(struct wpa_au 
     3@@ -1337,7 +1337,7 @@ static void wpa_send_eapol(struct wpa_au 
    44                         keyidx, encr, 0); 
    55  
Note: See TracChangeset for help on using the changeset viewer.