Author: cy Date: Thu Jul 19 20:10:34 2018 New Revision: 336506 URL: https://svnweb.freebsd.org/changeset/base/336506
Log: 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 Modified: head/contrib/wpa/src/rsn_supp/wpa.c head/contrib/wpa/src/rsn_supp/wpa_i.h Directory Properties: head/contrib/wpa/ (props changed) Modified: head/contrib/wpa/src/rsn_supp/wpa.c ============================================================================== --- head/contrib/wpa/src/rsn_supp/wpa.c Thu Jul 19 20:00:28 2018 (r336505) +++ head/contrib/wpa/src/rsn_supp/wpa.c Thu Jul 19 20:10:34 2018 (r336506) @@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_s os_memset(buf, 0, sizeof(buf)); } sm->tptk_set = 1; - sm->tk_to_set = 1; kde = sm->assoc_wpa_ie; kde_len = sm->assoc_wpa_ie_len; Modified: head/contrib/wpa/src/rsn_supp/wpa_i.h ============================================================================== --- head/contrib/wpa/src/rsn_supp/wpa_i.h Thu Jul 19 20:00:28 2018 (r336505) +++ head/contrib/wpa/src/rsn_supp/wpa_i.h Thu Jul 19 20:10:34 2018 (r336506) @@ -24,7 +24,6 @@ struct wpa_sm { struct wpa_ptk ptk, tptk; int ptk_set, tptk_set; unsigned int msg_3_of_4_ok:1; - unsigned int tk_to_set:1; u8 snonce[WPA_NONCE_LEN]; u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ int renew_snonce; _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"