DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Replace "dummy" with "stub" in Authenticator group keys

Browse source 
Replace the word "dummy" with the inclusive word "stub".

Signed-off-by: Arowa Suliman <arowa@chromium.org>
This commit is contained in:
Arowa Suliman 2021-09-18 23:24:29 -07:00 committed by Jouni Malinen
parent fb1bae2a71
commit 77dd712432
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ap/wpa_auth.c
View file

@ -2742,7 +2742,7 @@ static struct wpabuf * fils_prepare_plainbuf(struct wpa_state_machine *sm,
struct wpabuf *plain; struct wpabuf *plain;
u8 *len, *tmp, *tmp2; u8 *len, *tmp, *tmp2;
u8 hdr[2]; u8 hdr[2];
u8 *gtk, dummy_gtk[32]; u8 *gtk, stub_gtk[32];
size_t gtk_len; size_t gtk_len;
struct wpa_group *gsm; struct wpa_group *gsm;
size_t plain_len; size_t plain_len;
@ -2785,11 +2785,11 @@ static struct wpabuf * fils_prepare_plainbuf(struct wpa_state_machine *sm,
* Provide unique random GTK to each STA to prevent use * Provide unique random GTK to each STA to prevent use
* of GTK in the BSS. * of GTK in the BSS.
*/ */
if (random_get_bytes(dummy_gtk, gtk_len) < 0) { if (random_get_bytes(stub_gtk, gtk_len) < 0) {
wpabuf_clear_free(plain); wpabuf_clear_free(plain);
return NULL; return NULL;
} }
gtk = dummy_gtk; gtk = stub_gtk;
} }
hdr[0] = gsm->GN & 0x03; hdr[0] = gsm->GN & 0x03;
hdr[1] = 0; hdr[1] = 0;
@ -3372,7 +3372,7 @@ static u8 * replace_ie(const char *name, const u8 *old_buf, size_t *len, u8 eid,
SM_STATE(WPA_PTK, PTKINITNEGOTIATING) SM_STATE(WPA_PTK, PTKINITNEGOTIATING)
{ {
u8 rsc[WPA_KEY_RSC_LEN], *_rsc, *gtk, *kde = NULL, *pos, dummy_gtk[32]; u8 rsc[WPA_KEY_RSC_LEN], *_rsc, *gtk, *kde = NULL, *pos, stub_gtk[32];
size_t gtk_len, kde_len, wpa_ie_len; size_t gtk_len, kde_len, wpa_ie_len;
struct wpa_group *gsm = sm->group; struct wpa_group *gsm = sm->group;
u8 *wpa_ie; u8 *wpa_ie;
@ -3458,9 +3458,9 @@ SM_STATE(WPA_PTK, PTKINITNEGOTIATING)
* Provide unique random GTK to each STA to prevent use * Provide unique random GTK to each STA to prevent use
* of GTK in the BSS. * of GTK in the BSS.
*/ */
if (random_get_bytes(dummy_gtk, gtk_len) < 0) if (random_get_bytes(stub_gtk, gtk_len) < 0)
goto done; goto done;
gtk = dummy_gtk; gtk = stub_gtk;
} }
gtkidx = gsm->GN; gtkidx = gsm->GN;
_rsc = rsc; _rsc = rsc;
@ -3853,7 +3853,7 @@ SM_STATE(WPA_PTK_GROUP, REKEYNEGOTIATING)
const u8 *kde; const u8 *kde;
u8 *kde_buf = NULL, *pos, hdr[2]; u8 *kde_buf = NULL, *pos, hdr[2];
size_t kde_len; size_t kde_len;
u8 *gtk, dummy_gtk[32]; u8 *gtk, stub_gtk[32];
struct wpa_auth_config *conf = &sm->wpa_auth->conf; struct wpa_auth_config *conf = &sm->wpa_auth->conf;
SM_ENTRY_MA(WPA_PTK_GROUP, REKEYNEGOTIATING, wpa_ptk_group); SM_ENTRY_MA(WPA_PTK_GROUP, REKEYNEGOTIATING, wpa_ptk_group);
@ -3885,9 +3885,9 @@ SM_STATE(WPA_PTK_GROUP, REKEYNEGOTIATING)
* Provide unique random GTK to each STA to prevent use * Provide unique random GTK to each STA to prevent use
* of GTK in the BSS. * of GTK in the BSS.
*/ */
if (random_get_bytes(dummy_gtk, gsm->GTK_len) < 0) if (random_get_bytes(stub_gtk, gsm->GTK_len) < 0)
return; return;
gtk = dummy_gtk; gtk = stub_gtk;
} }
if (sm->wpa == WPA_VERSION_WPA2) { if (sm->wpa == WPA_VERSION_WPA2) {
kde_len = 2 + RSN_SELECTOR_LEN + 2 + gsm->GTK_len + kde_len = 2 + RSN_SELECTOR_LEN + 2 + gsm->GTK_len +

12
src/ap/wpa_auth_ft.c
View file

@ -2259,7 +2259,7 @@ static u8 * wpa_ft_igtk_subelem(struct wpa_state_machine *sm, size_t *len)
const u8 *kek, *igtk; const u8 *kek, *igtk;
size_t kek_len; size_t kek_len;
size_t igtk_len; size_t igtk_len;
u8 dummy_igtk[WPA_IGTK_MAX_LEN]; u8 stub_igtk[WPA_IGTK_MAX_LEN];
if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) { if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) {
kek = sm->PTK.kek2; kek = sm->PTK.kek2;
@ -2292,11 +2292,11 @@ static u8 * wpa_ft_igtk_subelem(struct wpa_state_machine *sm, size_t *len)
* Provide unique random IGTK to each STA to prevent use of * Provide unique random IGTK to each STA to prevent use of
* IGTK in the BSS. * IGTK in the BSS.
*/ */
if (random_get_bytes(dummy_igtk, igtk_len / 8) < 0) { if (random_get_bytes(stub_igtk, igtk_len / 8) < 0) {
os_free(subelem); os_free(subelem);
return NULL; return NULL;
} }
igtk = dummy_igtk; igtk = stub_igtk;
} }
if (aes_wrap(kek, kek_len, igtk_len / 8, igtk, pos)) { if (aes_wrap(kek, kek_len, igtk_len / 8, igtk, pos)) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
@ -2319,7 +2319,7 @@ static u8 * wpa_ft_bigtk_subelem(struct wpa_state_machine *sm, size_t *len)
const u8 *kek, *bigtk; const u8 *kek, *bigtk;
size_t kek_len; size_t kek_len;
size_t bigtk_len; size_t bigtk_len;
u8 dummy_bigtk[WPA_IGTK_MAX_LEN]; u8 stub_bigtk[WPA_IGTK_MAX_LEN];
if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) { if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) {
kek = sm->PTK.kek2; kek = sm->PTK.kek2;
@ -2352,11 +2352,11 @@ static u8 * wpa_ft_bigtk_subelem(struct wpa_state_machine *sm, size_t *len)
* Provide unique random BIGTK to each OSEN STA to prevent use * Provide unique random BIGTK to each OSEN STA to prevent use
* of BIGTK in the BSS. * of BIGTK in the BSS.
*/ */
if (random_get_bytes(dummy_bigtk, bigtk_len / 8) < 0) { if (random_get_bytes(stub_bigtk, bigtk_len / 8) < 0) {
os_free(subelem); os_free(subelem);
return NULL; return NULL;
} }
bigtk = dummy_bigtk; bigtk = stub_bigtk;
} }
if (aes_wrap(kek, kek_len, bigtk_len / 8, bigtk, pos)) { if (aes_wrap(kek, kek_len, bigtk_len / 8, bigtk, pos)) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,