From: Hai Shalom <haishalom@google.com>
Date: Wed, 29 Aug 2018 23:47:55 +0000 (-0700)
Subject: Parse sae_password option when CONFIG_SAE is enabled
X-Git-Tag: hostap_2_7~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=560e30bf3b463507213c5f7c63a0b8b1d7120cf6;p=thirdparty%2Fhostap.git

Parse sae_password option when CONFIG_SAE is enabled

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>
---

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 0e86f10e0..b1ab13e43 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -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;