jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make wpa_insert_pmkid() more generic

Browse source 
This is not used only with FT, so make the comments less confusing and
include the function in all builds to make it available for
non-FT/non-FILS builds.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-08-14 17:47:58 +03:00 committed by Jouni Malinen
parent d1fcf34cb5
commit 2ca23faf1c
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/wpa_common.c
View file

@ -2126,7 +2126,6 @@ int wpa_compare_rsn_ie(int ft_initial_assoc,
} }
#if defined(CONFIG_IEEE80211R) || defined(CONFIG_FILS)
int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid) int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid)
{ {
u8 *start, *end, *rpos, *rend; u8 *start, *end, *rpos, *rend;
@ -2141,11 +2140,10 @@ int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid)
start += 2 + start[1]; start += 2 + start[1];
} }
if (start >= end) { if (start >= end) {
wpa_printf(MSG_ERROR, "FT: Could not find RSN IE in " wpa_printf(MSG_ERROR, "RSN: Could not find RSNE in IEs data");
"IEs data");
return -1; return -1;
} }
wpa_hexdump(MSG_DEBUG, "FT: RSN IE before modification", wpa_hexdump(MSG_DEBUG, "RSN: RSNE before modification",
start, 2 + start[1]); start, 2 + start[1]);
/* Find start of PMKID-Count */ /* Find start of PMKID-Count */
@ -2171,8 +2169,8 @@ int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid)
/* Skip RSN Capabilities */ /* Skip RSN Capabilities */
rpos += 2; rpos += 2;
if (rpos > rend) { if (rpos > rend) {
wpa_printf(MSG_ERROR, "FT: Could not parse RSN IE in " wpa_printf(MSG_ERROR,
"IEs data"); "RSN: Could not parse RSNE in IEs data");
return -1; return -1;
} }
} }
@ -2203,7 +2201,7 @@ int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid)
* PMKID(s) first before adding the new one. * PMKID(s) first before adding the new one.
*/ */
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"FT: Remove %u old PMKID(s) from RSN IE", "RSN: Remove %u old PMKID(s) from RSNE",
num_pmkid); num_pmkid);
after = rpos + 2 + num_pmkid * PMKID_LEN; after = rpos + 2 + num_pmkid * PMKID_LEN;
os_memmove(rpos + 2, after, rend - after); os_memmove(rpos + 2, after, rend - after);
@ -2218,14 +2216,13 @@ int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid)
start[1] += PMKID_LEN; start[1] += PMKID_LEN;
} }
wpa_hexdump(MSG_DEBUG, "FT: RSN IE after modification " wpa_hexdump(MSG_DEBUG, "RSN: RSNE after modification (PMKID inserted)",
"(PMKID inserted)", start, 2 + start[1]); start, 2 + start[1]);
*ies_len += added; *ies_len += added;
return 0; return 0;
} }
#endif /* CONFIG_IEEE80211R || CONFIG_FILS */
int wpa_cipher_key_len(int cipher) int wpa_cipher_key_len(int cipher)