aboutsummaryrefslogtreecommitdiffstats
path: root/src/rsn_supp
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-07-01 20:51:31 (GMT)
committerJouni Malinen <j@w1.fi>2015-07-07 13:25:06 (GMT)
commit05a90d78dc7218b36c6202d9096af300310bf54f (patch)
tree8074f4ee699ee88824457a4a4233e3523275b032 /src/rsn_supp
parent348bc4e0ebfaafeb378044b586ff8b6bbbf19ad9 (diff)
downloadhostap-05a90d78dc7218b36c6202d9096af300310bf54f.zip
hostap-05a90d78dc7218b36c6202d9096af300310bf54f.tar.gz
hostap-05a90d78dc7218b36c6202d9096af300310bf54f.tar.bz2
FT: Allow CCMP-256 and GCMP-256 as group ciphers
The FT-specific check for valid group cipher in wpa_ft_gen_req_ies() was not up-to-date with the current list of supported ciphers. Fix this by using a generic function to determine validity of the cipher. In practice, this adds support for using CCMP-256 and GCMP-256 as the group cipher with FT. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/rsn_supp')
-rw-r--r--src/rsn_supp/wpa_ft.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index 06dea05..205793e 100644
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -168,9 +168,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
pos = (u8 *) (rsnie + 1);
/* Group Suite Selector */
- if (sm->group_cipher != WPA_CIPHER_CCMP &&
- sm->group_cipher != WPA_CIPHER_GCMP &&
- sm->group_cipher != WPA_CIPHER_TKIP) {
+ if (!wpa_cipher_valid_group(sm->group_cipher)) {
wpa_printf(MSG_WARNING, "FT: Invalid group cipher (%d)",
sm->group_cipher);
os_free(buf);