From patchwork Sat Oct 19 22:52:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "M. Ranganathan" X-Patchwork-Id: 1179909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OxB2avAL"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CR5yk89P"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46wdVF57c0z9sP4 for ; Sun, 20 Oct 2019 09:53:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:Subject: Message-ID:Date:From:MIME-Version:Reply-To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=JCtpxmOQFBiChpI8/opaXhdAc8QHuM+Ykw6CKU8U1F4=; b=OxB2avALtAq5eqqyXBnQ07yMcJ /MSPOm7X+g+qy1HmNEmQHPUN+hD9Feg6CIQSZQDtsTlqT0J5iFcXWOaiBc72HxeLHpgBFuqXNSatu lhEMe37vOvuI4KyxtrD3Ta/l8pmQRce9WsJJSyzQvwZu5v/3V7atuOfsK7IJVTVagAKH1ZMViox2w P9T/WGFI59KJXRoUQ6nYZeA9Q2s+YectZIK0oD2WGXK0GshXZPOsYNq2u+e4ypcJ5qtiEXHvhN3EB lFTdN9UqG5jczHTRGQiZR2gLvsWhXMBwbeU2/3308bwJJ46271te4GShHB78dIGjnQ5ZDWY+haUWA Vz0OAXMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLxaw-0008Pc-Fk; Sat, 19 Oct 2019 22:53:10 +0000 Received: from mail-il1-x144.google.com ([2607:f8b0:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLxas-0008Ov-Q6 for hostap@lists.infradead.org; Sat, 19 Oct 2019 22:53:08 +0000 Received: by mail-il1-x144.google.com with SMTP id l12so8757946ilq.4 for ; Sat, 19 Oct 2019 15:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=eRxlO7PbXvC1FhKBUSFyCGgnlZKLv7/TYKnHD3B4rrI=; b=CR5yk89PKBfJlhlRCJIgAZ0pAfz+N3QLuZG6UlSGFuhcPLgy1/ewCnAmtmw9CmwJ88 iLNZHdg4PKAiS+WcAJtuuBzmYDsjpJh3055XOx6hoRejDO9Er1+IztlI40ch0hqh4LMU eeQU4CdxEBtn0Ql/3Ew8qcItCuojwmy0FJfWtCp5H5fwpOhDth+exYU37+2d2tOyu5hQ dHR1wUCswLCcTtTFuHf3jR0InHi7qeE8t8YaQKg2OROajMyWV8KdZ8z7go+oxrQH7FuC CUS7y/eKOQMVxAC3tMom0sl8IdsCYz/K6/RTXAhG/Kn6Nq4r1/ZIOnfnQ/xJG7Zgah3v kmqg== 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=eRxlO7PbXvC1FhKBUSFyCGgnlZKLv7/TYKnHD3B4rrI=; b=Z6ELkk4bVu0F9QnrQjKZn9VeORW5EUX/H2vq0ICxKr4H1/sWmXNe2D2MCjqEEK59ac viYhxF0sVsYxyDH03KHX5zQRhmxmcXTpQS8H+HWdiDj+/ST7ffbz71h3cCqO/HeVGl3a cYI7j9paZzNEW8+AswL+He+IuTPP4OHSeNsiflcQKliMdDS4HsLkZEfuoKFmv76MUyOY ARMFE8OHOzeYwiOYIcW5y68dgDd2Oqu1779u0mEmqGoxsUBaVm34EpKx6ObX+MyeIiB7 VpzKzmfOEHB1hOSgqp5+NZQR6AEPeBwoZ29a7vcpxBzFLSzJo+LxriInPaR8QUeMizpJ OcHA== X-Gm-Message-State: APjAAAUPiOoOPNEk9FFMbMhKbFr4csmY3R1Rr3NfT4r4Mfle9RpHTWZT Ko5dw2ttDuQ+E4ks7GGWd/Dplp7mkDh7PLnQWSlyJOks8ao= X-Google-Smtp-Source: APXvYqyFqFF0bfsGIkD1a9SaplLNSK2a+1jPkP7s9QaD/dYOyvQqbIePxjaS80GW9qLL6tkzLENQVfupON1O3JejA1I= X-Received: by 2002:a92:ccd0:: with SMTP id u16mr18427350ilq.296.1571525583017; Sat, 19 Oct 2019 15:53:03 -0700 (PDT) MIME-Version: 1.0 From: "M. Ranganathan" Date: Sat, 19 Oct 2019 18:52:26 -0400 Message-ID: Subject: A possible bug and a fix (patch attached) To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191019_155306_872669_853A291F X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (mranga[at]gmail.com) -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 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 Hello, I ran into an issue in config_file.c The function is static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid) When writing out the ssid, the quote is omitted. I had to make the following changes: #define QUOTED_STR(t) write_quoted_str(f, #t, ssid) //STR(ssid); QUOTED_STR(ssid); And I had to add the function : static void write_quoted_str(FILE *f, const char *field, struct wpa_ssid *ssid) { char *value = wpa_config_get(ssid, field); if (value == NULL) return; fprintf(f, "\t%s=\"%s\"\n", field, value); str_clear_free(value); } Also I've run into a bug with dpp which can't handle SSID's larger than 4 characters it appears. diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index cf4b7bc..864b61c 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -496,6 +496,14 @@ static void write_str(FILE *f, const char *field, struct wpa_ssid *ssid) str_clear_free(value); } +static void write_quoted_str(FILE *f, const char *field, struct wpa_ssid *ssid) +{ + char *value = wpa_config_get(ssid, field); + if (value == NULL) + return; + fprintf(f, "\t%s=\"%s\"\n", field, value); + str_clear_free(value); +} static void write_int(FILE *f, const char *field, int value, int def) { @@ -748,8 +756,10 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid) #define INTe(t, m) write_int(f, #t, ssid->eap.m, 0) #define INT_DEF(t, def) write_int(f, #t, ssid->t, def) #define INT_DEFe(t, m, def) write_int(f, #t, ssid->eap.m, def) +#define QUOTED_STR(t) write_quoted_str(f, #t, ssid) - STR(ssid); + //STR(ssid); + QUOTED_STR(ssid); INT(scan_ssid); write_bssid(f, ssid); write_bssid_hint(f, ssid); @@ -1407,9 +1417,6 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config) fprintf(f, "\n"); } - if (config->sae_pwe) - fprintf(f, "sae_pwe=%d\n", config->sae_pwe); - if (config->sae_pmkid_in_assoc) fprintf(f, "sae_pmkid_in_assoc=%d\n", config->sae_pmkid_in_assoc);