]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
FILS: Fix RSN info in FD frame for no-group-addressed
authorJouni Malinen <j@w1.fi>
Sun, 28 Feb 2021 09:27:42 +0000 (11:27 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 28 Feb 2021 09:27:42 +0000 (11:27 +0200)
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 <j@w1.fi>
src/ap/wpa_auth_ie.c

index d4710316a96d80817a09262b4a03b2965ec90dd0..524922e4e686442074320544cf25a6981d734a9b 100644 (file)
@@ -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 */