From: Jouni Malinen Date: Sun, 28 Feb 2021 09:27:42 +0000 (+0200) Subject: FILS: Fix RSN info in FD frame for no-group-addressed X-Git-Tag: hostap_2_10~508 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a1136b7f19bd0369b93b3c53d0f95f5d8be3c50;p=thirdparty%2Fhostap.git FILS: Fix RSN info in FD frame for no-group-addressed The value from the initial RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED check ended up getting overridden with the following if. This was supposed to be a single if statement to avoid that. Fixes: 9c02a0f5a672 ("FILS: Add generation of FILS Discovery frame template") Signed-off-by: Jouni Malinen --- diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c index d4710316a..524922e4e 100644 --- a/src/ap/wpa_auth_ie.c +++ b/src/ap/wpa_auth_ie.c @@ -1169,7 +1169,7 @@ bool wpa_auth_write_fd_rsn_info(struct wpa_authenticator *wpa_auth, suite = wpa_cipher_to_suite(WPA_PROTO_RSN, conf->wpa_group); if (suite == RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED) cipher = 63; /* No cipher suite selected */ - if ((suite >> 8) == 0x000fac && ((suite & 0xff) <= 13)) + else if ((suite >> 8) == 0x000fac && ((suite & 0xff) <= 13)) cipher = suite & 0xff; else cipher = 62; /* vendor specific */