From patchwork Wed Aug 29 23:47:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hai Shalom X-Patchwork-Id: 964327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iDwfzMYU"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="MAuyGLxd"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 421t2L42Ztz9s1c for ; Fri, 31 Aug 2018 18:34:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: MIME-Version:Reply-To:Cc:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ae6vWFOvFXBg2W05Pl8DQ9JzURCwCX8Ymlk81Y8mu7I=; b=iDw fzMYUCHT+6+o1FOto262aXvIF36qhso8xMBcgMukl6vhkmwwo/yJNIPRg4Z4XtX4N/t6htM+MSOof CYSPqh/LezfdiOJdOkyZffyvy42kwEm4jo1UnrqWGmCotCGFDzfB6L/F0DRx/0BMEu0cuDj6SJcn+ hk63hiABqqBz5XhFSlhEZBr6g58b7jHOsscIvQq14dKXn0mEXbmAHpI0Lzv5Wm30CkmvBlZsPQuRq GsSCtYpq0etcKHCNwaHvkBPIv/cBOCmOny/nzkItgno1pZFILs01WIAj6SsAGFBc9yIsqjau+92lb L01Bg5f9eUQ/ODJPCHF5nDiZwbtd9cA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvese-0005Wk-3f; Fri, 31 Aug 2018 08:34:12 +0000 Received: from mail-vk0-x242.google.com ([2607:f8b0:400c:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvACY-0002I2-PX for hostap@lists.infradead.org; Wed, 29 Aug 2018 23:48:44 +0000 Received: by mail-vk0-x242.google.com with SMTP id b78-v6so3412020vka.12 for ; Wed, 29 Aug 2018 16:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=aGcY8B+VCvjav+ibsz3+1CU5uZhtZbzUDUSh2gwvOBs=; b=MAuyGLxdRsqd7Mgw4XwjWGBW7FYp9vg6DBvr4XT/1H6IkoEgFm8UMiRc6Yu5jWGNjM rXwYfIz9V5geZfHaZgNwCgWnHBRRpQoiVnG57RNA4p0fiOkA0KGIsJ8xd9/WXI/pWuT6 jY8UbDsGdh71hJm7kqbAQMy4eLaZMt+SghKqAlhc7noiWK7jW64bf+4PumQr1lCOzUag uGtEyUAyn5PoaEc9FCl0iRCfAZMNvVFWl9RoPlWeg9kKBUxN66t6xBXXIZSg5CUmxFbW 3NdxA5adXMG5wu8DGU4LxzNJoOl8IcXjle0oYkodRdTIilFFnOVKqNzhjTl471uyRE0O naKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=aGcY8B+VCvjav+ibsz3+1CU5uZhtZbzUDUSh2gwvOBs=; b=rMRcHuiaOjZy5FrqnIuJh3G3OPYmWuiu276OTS/pGaRuiwEE+0URd2gXENcQQ008Pv cJrsDW0kgyPYDWNAuCW7KtcdS7l4F4Gl2gPBXB35m8icdh0WtmKuhz8e30LeqGSKzUmQ w7Qy4xEwiF149hfVzCTSr0TUdDyxVkjyAewEJWneZW4pUSCjra0ik8wMDfK3Z8TM5Jdj sfzBdaEuTb53BQTe2c9AUVQyzZecrvZf8EFk/YB5xbRIBTSgk0V3UW2JdH+k+yiY+qOl g14mHdBG6hQNxzytW/QWxF5s78O2IxJPfzpSQe7H4Ieca0uLg7H4yW07mJAQYzoqGlFZ 6Jpg== X-Gm-Message-State: APzg51CC0cCNN6ouIB5ozs/017GO39dajZBJ04RUyYb7ihN72OfOkk/3 wpu7HjGa2ecvjc1yAYu8rrohf/obwG9rYi8HZvE9YPxbMGU= X-Google-Smtp-Source: ANB0VdbPpmvvFXW+WHD8IGxyo/MMKNZz+WZZhkIUmAv5rMM4et38fGgIHL4g/iZE1pt2uDKRN4OHcAbN9FyZuCZl8Mk= X-Received: by 2002:a1f:e86:: with SMTP id 128-v6mr5442335vko.4.1535586511116; Wed, 29 Aug 2018 16:48:31 -0700 (PDT) MIME-Version: 1.0 From: Hai Shalom Date: Wed, 29 Aug 2018 16:47:55 -0700 Message-ID: Subject: [PATCH] 0001-Parse-sae_password-option-when-CONFIG_SAE-is-enabled.patch To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180829_164842_849208_1D6D89D4 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -15.6 (---------------) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-15.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400c:c05:0:0:0:242 listed in] [list.dnswl.org] -7.5 USER_IN_DEF_SPF_WL From: address is in the default SPF white-list -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.5 ENV_AND_HDR_SPF_MATCH Env and Hdr From used in default SPF WL Match -0.0 T_DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-Mailman-Approved-At: Fri, 31 Aug 2018 01:33:58 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From fe521d99ff2b271704a89fb60cffd5395924375b Mon Sep 17 00:00:00 2001 From: Hai Shalom 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 --- 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; 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) {