From patchwork Mon Dec 21 18:40:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1419190 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=2001:8b0:10b:1231::1; helo=merlin.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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=z9K1PZPU; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Yys5hm/h; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4D07cc2b0Mz9sVk for ; Tue, 22 Dec 2020 05:42:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=O72KRVXLBdyoCTx5wXCnXp3el4R6GtdBxdGi5ad1NLU=; b=z9K1PZPUzl7MyTO3mU3F/zidZR 0dLapXhUo0t8R9QU7wtiZFpWAucC6IAtQJ5h2Wbwb944IQMVuJgSlFfhR2v+W95KF5kZHDHKdQqea 3cMdPGvzjADbaoeWmt+7iFoxEML1Uo/7lR+byyxUqsJaOIKFzfkdHUmtkDzlCbcFFgzh8/G/pk2jU XEk7XAECh3ESbxLK+1I25FBWLv5twJmv19uI7bRdTZsngid1oo2ne3mm7fmtl5qV0Krc0UKZobkVd qIFd8tukw9TfgsTo9shr/cAWS4Ublrl1Z5X4iaYyffr+HLplDTUCYG370zLTYST7h6xJAcB9PH4Il Wi0Q43+A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krQ77-0006H6-UH; Mon, 21 Dec 2020 18:40:57 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krQ74-0006Fq-Eo for hostap@lists.infradead.org; Mon, 21 Dec 2020 18:40:55 +0000 Received: by mail-pl1-x631.google.com with SMTP id 4so6061687plk.5 for ; Mon, 21 Dec 2020 10:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LTx88DXHG/afYevgm+lSxxXxYPXg3UCy7mjGZIrGU0U=; b=Yys5hm/heMFeKzE8E9Y1j7FHFGdtJkri+/cppzyGD2E2vo0joh8BGEEUVooxzagEtJ BImpWcPJiPUf5vLVJkEqrtI9H22WQkxz7a7n/NFYl0IvZWBqH32ahv6rshgj2/tHZw6d g43Y0A0pwTiEHwktcU7XCfzqV0jw+I0Nim4J8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LTx88DXHG/afYevgm+lSxxXxYPXg3UCy7mjGZIrGU0U=; b=iYtVJxV77W7JOnjQ6rsEFtW2O/zkQqodZwZPa8J+JXt6jX6kQeq29g7ZY27RVP0yKR pswMTMUMJRIXQ85MC8p1d1k8m6GOgtswljcXT7TZagEeKuVbOOq6VqlUrBEi46GeBt8D +FaBrOsyonfFmokB3ZgvddhwvCzO77pc8gS5Fhthet+s/k+RDVC8oeA80RA3G1MbVM+8 a8y2s0jRTIl0AUfEykWes7JGRUdLzxt5d+34riLuLI7lIRGqOMfnSW9PCN6y32KKQnda X/l3SLtNSI9KXcqkuscxpFPfr9pzMqb2NY6A8N7ZIFZZD22EqK5zbRoUq4QkCs7NPH4Z AHEQ== X-Gm-Message-State: AOAM5333P1XZO+RCt9K7JDW+M86ZWKrwuna4pP9IOB5JGgb+SozZmxSs 5Hn7IcZe6FBoP0Z9Rt+BHWoU+BSzzWNbWg== X-Google-Smtp-Source: ABdhPJwtCP9n6ytzIRa+crLkiR1UZL7FneQpfl8AuQfLS/dM0AWkfRYk4zxffNMSbIBhRRka3TrERw== X-Received: by 2002:a17:90a:950c:: with SMTP id t12mr18749719pjo.226.1608576050097; Mon, 21 Dec 2020 10:40:50 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:201:8edc:d4ff:fe53:350d]) by smtp.gmail.com with ESMTPSA id x1sm92332pfn.48.2020.12.21.10.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 10:40:48 -0800 (PST) From: Brian Norris To: hostap@lists.infradead.org Subject: [PATCH] DBus: add 'owe' to interface Capabilities Date: Mon, 21 Dec 2020 10:40:31 -0800 Message-Id: <20201221184031.70548-1-briannorris@chromium.org> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201221_134054_507842_8E32BD61 X-CRM114-Status: GOOD ( 11.56 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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:631 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.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender 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: , Cc: Brian Norris Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Brian Norris --- doc/dbus.doxygen | 2 +- wpa_supplicant/dbus/dbus_new_handlers.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index 06e53b98c278..8231aac41805 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -669,7 +669,7 @@ fi.w1.wpa_supplicant1.CreateInterface. PairwiseasPossible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "none" GroupasPossible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "wep104", "wep40" GroupMgmtasPossible array elements: "aes-128-cmac", "bip-gmac-128", "bip-gmac-256", "bip-cmac-256" - KeyMgmtasPossible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "sae", "ieee8021x", "wpa-none", "wps", "none" + KeyMgmtasPossible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "sae", "owe", "ieee8021x", "wpa-none", "wps", "none" ProtocolasPossible array elements: "rsn", "wpa" AuthAlgasPossible array elements: "open", "shared", "leap" ScanasPossible array elements: "active", "passive", "ssid" diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index fa9a1a370d44..7ff224ef126a 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -2869,6 +2869,12 @@ dbus_bool_t wpas_dbus_getter_capabilities( goto nomem; #endif /* CONFIG_SAE */ +#ifdef CONFIG_OWE + if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_OWE) && + !wpa_dbus_dict_string_array_add_element(&iter_array, "owe")) + goto nomem; +#endif /* CONFIG_OWE */ + if (!wpa_dbus_dict_end_string_array(&iter_dict, &iter_dict_entry, &iter_dict_val,