MFV r336490:
Prevent installation of an all-zero TK. This is also upline git commit 53bb18cc8b7a4da72e47e4b3752d0d2135cffb23. Obtained from: https://w1.fi/security/2017-1/\ rebased-v2.6-0004-Prevent-installation-\ of-an-all-zero-TK.patch X-MFC-with: r336203
This commit is contained in:
commit
1b911983db
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336506
@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
|
|||||||
os_memset(buf, 0, sizeof(buf));
|
os_memset(buf, 0, sizeof(buf));
|
||||||
}
|
}
|
||||||
sm->tptk_set = 1;
|
sm->tptk_set = 1;
|
||||||
sm->tk_to_set = 1;
|
|
||||||
|
|
||||||
kde = sm->assoc_wpa_ie;
|
kde = sm->assoc_wpa_ie;
|
||||||
kde_len = sm->assoc_wpa_ie_len;
|
kde_len = sm->assoc_wpa_ie_len;
|
||||||
|
@ -24,7 +24,6 @@ struct wpa_sm {
|
|||||||
struct wpa_ptk ptk, tptk;
|
struct wpa_ptk ptk, tptk;
|
||||||
int ptk_set, tptk_set;
|
int ptk_set, tptk_set;
|
||||||
unsigned int msg_3_of_4_ok:1;
|
unsigned int msg_3_of_4_ok:1;
|
||||||
unsigned int tk_to_set:1;
|
|
||||||
u8 snonce[WPA_NONCE_LEN];
|
u8 snonce[WPA_NONCE_LEN];
|
||||||
u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
|
u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
|
||||||
int renew_snonce;
|
int renew_snonce;
|
||||||
|
Loading…
Reference in New Issue
Block a user