]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Parse sae_password option when CONFIG_SAE is enabled
authorHai Shalom <haishalom@google.com>
Wed, 29 Aug 2018 23:47:55 +0000 (16:47 -0700)
committerJouni Malinen <j@w1.fi>
Sun, 2 Sep 2018 09:30:37 +0000 (12:30 +0300)
Call to parse_sae_password was incorrectly depending
on CONFIG_TESTING_OPTIONS and CONFIG_SAE. Should
depend only on the latter.

Fixes: 2377c1caef77 ("SAE: Allow SAE password to be configured separately (AP)")
Signed-off-by: Hai Shalom <haishalom@google.com>
hostapd/config_file.c

index 0e86f10e0e530895f5b77c875f0b6361f1a03823..b1ab13e4384edd483afdb5b9149d49e1ab5354f4 100644 (file)
@@ -3867,6 +3867,7 @@ static int hostapd_config_fill(struct hostapd_config *conf,
        } else if (os_strcmp(buf, "sae_commit_override") == 0) {
                wpabuf_free(bss->sae_commit_override);
                bss->sae_commit_override = wpabuf_parse_bin(pos);
+#endif /* CONFIG_TESTING_OPTIONS */
 #ifdef CONFIG_SAE
        } else if (os_strcmp(buf, "sae_password") == 0) {
                if (parse_sae_password(bss, pos) < 0) {
@@ -3875,7 +3876,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
                        return 1;
                }
 #endif /* CONFIG_SAE */
-#endif /* CONFIG_TESTING_OPTIONS */
        } else if (os_strcmp(buf, "vendor_elements") == 0) {
                if (parse_wpabuf_hex(line, buf, &bss->vendor_elements, pos))
                        return 1;