diff mbox series

0001-Parse-sae_password-option-when-CONFIG_SAE-is-enabled.patch

Message ID CADrZi0dcoPYWjExk116Rn9qGLToxC6KaMcAEGN9yHykYz6b6eg@mail.gmail.com
State Accepted
Headers show
Series 0001-Parse-sae_password-option-when-CONFIG_SAE-is-enabled.patch | expand

Commit Message

Hai Shalom Aug. 29, 2018, 11:47 p.m. UTC 
From fe521d99ff2b271704a89fb60cffd5395924375b Mon Sep 17 00:00:00 2001
From: Hai Shalom <haishalom@google.com>
Date: Wed, 29 Aug 2018 15:43:57 -0700
Subject: [PATCH] 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.

Signed-off-by: Hai Shalom <haishalom@google.com>
---
 hostapd/config_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  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;

Comments

Jouni Malinen Sept. 2, 2018, 2:41 p.m. UTC | #1 
On Wed, Aug 29, 2018 at 04:47:55PM -0700, Hai Shalom wrote:
> Call to parse_sae_password was incorrectly depending
> on CONFIG_TESTING_OPTIONS and CONFIG_SAE. Should
> depend only on the latter.

Thanks, applied.
diff mbox series

Patch

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 0e86f10..b1ab13e 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) {