From patchwork Thu Jul 1 07:05:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499387 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=y4Vm1Jh+; 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=Nnf5U182; 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 4GFq4z6JvJz9sWw for ; Thu, 1 Jul 2021 17:06:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QC/yNFfkKfi75+QCXI9X1pNAG5dYV5fITiphBabrytQ=; b=y4Vm1Jh+JAn3OU PM+CtNTCun9D+nkmxL6Yk10mQhSEEEjvdBdPKXJ86/klZiQSZnXsWzxYwZKUZCzNjmDYI+nrLyPc2 OFOjpWjRkpWo+wpJXn0WTwvJpnMQrD8TXWHrKX4kilJMFGpm7Xyobzo3L7lGaQOyBW7nwgt31aLf6 hzhzAkrfh3NCMu++vIu/Pb7QtWJeGA8Na48WcvPFC0ssFA3gFmeR6lOrVTbj3wZcDk+gUakUloKLm UeebIKdIHRjWYU9P3LtmnzGgdPu8IzJG/bt9HpJRr58CNMFQZAd7KhIrHabCu9M7zVrYq0Vj3k4jx n3BFKBhK34egadeVZnBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlf-00GKev-Ig; Thu, 01 Jul 2021 07:05:47 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlW-00GKbh-Md for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:39 +0000 Received: by mail-pl1-x636.google.com with SMTP id i13so3085588plb.10 for ; Thu, 01 Jul 2021 00:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zo1St17t5dLHSIt7Jdbkk/aMAOz9iX0ly7HZgpniL9M=; b=Nnf5U1822Q1L2h3KUkYVJfjcBohPMmqYJ2ryhppdqyHU1ycjvFQJPp05VZm2OUX77J PYj4yKe3Zmb0cFvNmxM89rKxBUbxa65vyeMvso3wZwgZnhdSiuIkuoGEE/msjggHpzQ+ +GCqS3IGQJn7JOhx050/cbQHfjtn3Xp3OEKwU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zo1St17t5dLHSIt7Jdbkk/aMAOz9iX0ly7HZgpniL9M=; b=k/YUdC6kpHdRPmP1WTxOFcyAzTfMZm5JaM04061ngZPZsz+65ij7Z9eQUJacY03f3R uuGRzgFnbhIHAe2MBVDWiVpmFhVUgNVYq9t3lRfp3yUTlmREdFJeZdObXpk3SPa3GZ15 GcosoFs9FMGblVPuGkB9CBK10DpYUzytyUIm/xfe/adI/yR5IDv5YDPTmsxV2VA6xkTF d9/F4+X4c5DFe1+YTuRkdS4yBMP+Vmze/JuL2+amSeW4ejVYdV3GsiPCelYQKVmYIh4x ZS6Ienu/O3V7WqANj71G8SEIcV/DJDm9yHyUW1WNyaYxXaVrBJpUO04mLKz5TKpyCktl BdXw== X-Gm-Message-State: AOAM533yi5nIT4bN0BL1WtxbKXmtE2RI6RdkINHa6seLgJWQGqxva2D9 LivS/GHXIsl/zr3QaJZY5FgQ9QO8XvZ2dA== X-Google-Smtp-Source: ABdhPJzimIjbNoIRthKy5sB3SaH/9MWkkWPKTrwWpN1Qg+2I02ThYaCiOmkBO84/sV6KJR2Dd0QM7Q== X-Received: by 2002:a17:90a:1c02:: with SMTP id s2mr42980139pjs.172.1625123136696; Thu, 01 Jul 2021 00:05:36 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:36 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 1/7] wpa_supplicant: hostapd: Replace MITM with PITM. Date: Thu, 1 Jul 2021 00:05:22 -0700 Message-Id: <20210701070528.2125299-2-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000538_774773_C1E14093 X-CRM114-Status: GOOD ( 13.49 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replace man-in-the-middle with person-in-the-middle which is gender-neutral. Signed-off-by: Arowa Suliman --- hostapd/hostapd.conf | 2 +- wpa_supplicant/wpa_supplicant.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Content analysis details: (-0.4 points, 5.0 required) 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:636 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replace man-in-the-middle with person-in-the-middle which is gender-neutral. Signed-off-by: Arowa Suliman --- hostapd/hostapd.conf | 2 +- wpa_supplicant/wpa_supplicant.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index b5d15061f..b027be3e3 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -1832,7 +1832,7 @@ own_ip_addr=127.0.0.1 #assoc_sa_query_retry_timeout=201 # ocv: Operating Channel Validation -# This is a countermeasure against multi-channel man-in-the-middle attacks. +# This is a countermeasure against multi-channel person-in-the-middle attacks. # Enabling this depends on the driver's support for OCV when the driver SME is # used. If hostapd SME is used, this will be enabled just based on this # configuration. diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index e3ae77114..702862bec 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -988,7 +988,7 @@ fast_reauth=1 # WPA3-Personal-only mode: ieee80211w=2 and key_mgmt=SAE # # ocv: whether operating channel validation is enabled -# This is a countermeasure against multi-channel man-in-the-middle attacks. +# This is a countermeasure against multi-channel person-in-the-middle attacks. # Enabling this automatically also enables ieee80211w, if not yet enabled. # 0 = disabled (default) # 1 = enabled if wpa_supplicant's SME in use. Otherwise enabled only when the From patchwork Thu Jul 1 07:05:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499389 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=pll5r54V; 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=ofGf6Lt8; 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 4GFq595HhNz9sVb for ; Thu, 1 Jul 2021 17:06:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nbrf21T0dLdVamfR9uA/ilJJff6aKWbhHx7sPxl2TUI=; b=pll5r54VXoRmf+ AcIeJBP5YvRtCwUztscgmkqvTfXKRNgi/1C4C+/q0PcxU490qyyMRqQtKcPHqErXiPYTtsd6OoL9N Dfw1etkLV51ji7cH9ey3A/iCfM1a2BqqHq5WrhPNasmq+0mA/KPIWnQ1VfnjBtSV8ooRDJfZuTgyA O6hR8oufTnsImdbaxk3Nu60PECKAQ59S0HaC84VnZayLD5LYORGVj8lxM5W4ByOgAe/QFtPROb6la HXKkXAdTTCAhOOSViuKIoLCi8Ck0Ganp7uoesLLrSHm3Rs8d+WeGfI/AwUmSqyF5tL9s03YPGNuLL PP9Z3WAPqNK72AtvR4ug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlo-00GKgt-A9; Thu, 01 Jul 2021 07:05:56 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlY-00GKc5-D3 for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:42 +0000 Received: by mail-pl1-x635.google.com with SMTP id b5so3138206plg.2 for ; Thu, 01 Jul 2021 00:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jVJdOPIE+orsW19cwgDQ/dY532DrwQvBVxBixL6mBHg=; b=ofGf6Lt889CU33GKsQ8aUfcVEC1n76H2NrhP9Vc7Dk+zNpMBymChISUOEUh0YODPlF CE0aE89ZTswPVknKPYDPt7WufKgqWGxXSUqsO85eCCTPHXoHTXSrasTZvr/dRVCmHEDW dX9JSyIpkF+C4ODSph1u/hV6SKlIqgF2bdbo8= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jVJdOPIE+orsW19cwgDQ/dY532DrwQvBVxBixL6mBHg=; b=ZjxCgxOI5afHelf+K6MNQ6pqoGuLrZctmra+qynNa0cSWhME7/PxPrqKN9ZZiT+v4w DCVHRk5Go1A2NFb0vycOG6dUTpkXMUs7tcke9MABi5QEwV1U6T3fVBCVls4/DxDdtAGZ bjYqhNWU2CVi93NpL7+KmVX3PKMIgvcTp5QH51juOjjE/9eWS6tPPNlT/emvebRlsoNE 6vIKo+B5/ce7xLBe1CiRMyIMwFwR6qfXq5vq2BZlhPqNAS2v93kjDggSgDUmhC3Uk987 EJTHzbrQ8kHvvw0MfSn8jBp3nDZOqwJn2N+VDsvVgFL+3KBbU728XNW/BnpnW2Pa2Onu F4aQ== X-Gm-Message-State: AOAM531pUuqGNaG4WXt/4pDLhVk95vZrvAcbpEA2HSLq/VqgUGdmtA2x 3Eqe122Su4gQHed+Qc8LVkTwm3Yn6Nc0Pg== X-Google-Smtp-Source: ABdhPJy76gomySBPdV/QKAMUjqKYnYViRkq7qdhxA4fIv8KMvHEls9Bpvw1AxGPiLm2nayPdqd3+Jw== X-Received: by 2002:a17:90b:2504:: with SMTP id ns4mr8739431pjb.140.1625123138388; Thu, 01 Jul 2021 00:05:38 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:38 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 2/7] wpa_supplicant: doc: Replace Native with Built-in. Date: Thu, 1 Jul 2021 00:05:23 -0700 Message-Id: <20210701070528.2125299-3-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000540_472344_C640D472 X-CRM114-Status: GOOD ( 19.78 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the word Native with more inclusive words such as built-in. Signed-off-by: Arowa Suliman --- doc/code_structure.doxygen | 2 +- doc/driver_wrapper.doxygen | 2 +- doc/p2p.doxygen | 4 ++-- doc/porting.doxygen | 2 +- wpa_supplicant/ChangeLog | [...] Content analysis details: (-0.4 points, 5.0 required) 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:635 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replaced the word Native with more inclusive words such as built-in. Signed-off-by: Arowa Suliman --- doc/code_structure.doxygen | 2 +- doc/driver_wrapper.doxygen | 2 +- doc/p2p.doxygen | 4 ++-- doc/porting.doxygen | 2 +- wpa_supplicant/ChangeLog | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/code_structure.doxygen b/doc/code_structure.doxygen index 454f17975..ff11506fa 100644 --- a/doc/code_structure.doxygen +++ b/doc/code_structure.doxygen @@ -62,7 +62,7 @@ with with hostapd. The following C files are currently used: Definitions shared by multiple files \ref l2_packet.h, \ref l2_packet_linux.c, and \ref l2_packet_pcap.c - Layer 2 (link) access wrapper (includes native Linux implementation + Layer 2 (link) access wrapper (includes built-in Linux implementation and wrappers for libdnet/libpcap). A new l2_packet implementation may need to be added when porting to new operating systems that are not supported by libdnet/libpcap. Makefile can be used to select which diff --git a/doc/driver_wrapper.doxygen b/doc/driver_wrapper.doxygen index 66211b3ab..fde256564 100644 --- a/doc/driver_wrapper.doxygen +++ b/doc/driver_wrapper.doxygen @@ -27,7 +27,7 @@ documented in \ref driver.h. In addition, a pointer to the 'struct \ref wpa_driver_ops' needs to be registered in \ref drivers.c file. When porting to other operating systems, the driver wrapper should be -modified to use the native interface of the target OS. It is possible +modified to use the built-in interface of the target OS. It is possible that some extra requirements for the interface between the driver wrapper and generic wpa_supplicant code are discovered during porting to a new operating system. These will be addressed on case by case diff --git a/doc/p2p.doxygen b/doc/p2p.doxygen index d4d86e3ed..475295e94 100644 --- a/doc/p2p.doxygen +++ b/doc/p2p.doxygen @@ -274,8 +274,8 @@ for removing the group interface for the failed group. P2P protocol includes service discovery functionality that can be used to discover which services are provided by the peers before forming a group. This leverages the Generic Advertisement Service (GAS) protocol -from IEEE 802.11u and P2P vendor-specific contents inside the Native -GAS messages. +from IEEE 802.11u and P2P vendor-specific contents inside the GAS +messages. The P2P module takes care of GAS encapsulation, fragmentation, and actual transmission and reception of the Action frames needed for diff --git a/doc/porting.doxygen b/doc/porting.doxygen index b4b78ef05..2144a4053 100644 --- a/doc/porting.doxygen +++ b/doc/porting.doxygen @@ -21,7 +21,7 @@ most targets. However, couple of additional functions that are common on modern UNIX systems are used. Number of these are listed with prototypes in \ref common.h (the \verbatim #ifdef CONFIG_ANSI_C_EXTRA \endverbatim block). These functions may need to be implemented or at least defined -as macros to native functions in the target OS or C library. +as macros to built-in functions in the target OS or C library. Many of the common ANSI C functions are used through a wrapper definitions in \ref os.h to allow these to be replaced easily with a diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog index a06a93b22..34318f489 100644 --- a/wpa_supplicant/ChangeLog +++ b/wpa_supplicant/ChangeLog @@ -1864,7 +1864,7 @@ ChangeLog for wpa_supplicant generate, e.g., man pages * l2_packet_linux: use socket type SOCK_DGRAM instead of SOCK_RAW for PF_PACKET in order to prepare for network devices that do not use - Ethernet headers (e.g., network stack with native IEEE 802.11 frames) + Ethernet headers (e.g., network stack with original IEEE 802.11 frames) * use receipt of EAPOL-Key frame as a lower layer success indication for EAP state machine to allow recovery from dropped EAP-Success frame From patchwork Thu Jul 1 07:05:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499392 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=k72o5HXw; 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=S1h+WKCI; 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 4GFq6Q4XF2z9sVb for ; Thu, 1 Jul 2021 17:07:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YKcx2gF/6SfUUcx5uWJrrHfrAITvDbJvyCId8B/fp9Q=; b=k72o5HXwf8wy10 Z5dTY8+SHk3KkXcsiAHORBQkyCCUKuWtftxZ0FA20Dfl1XnkHTqI/Ik3QUFd9XpL5J8dxXdPINHH0 ffzSVcl+HktEjHAzjfOSsb3DE1KBkViLKGhRne8MhIhVaqA4mGPEsVR6IsD1Rn+ukY0UqNH3de5V5 4OCYjwxbAx5efTMpO3kBadoK2Cm7dfgwJr6a9+YCozmRzuzvbT1nLqFnyMjh2PLt7rg6NF/i9DFW3 Z84l+K2t6DsRymbX0ApcX98X45NBIHNaulxwJ5tKGgk/HK+4CviCSaVgpiS0JTOJCs/OeF1T7OvoZ 3mikXJQ6srKbk0F+gAAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlz-00GKk3-7l; Thu, 01 Jul 2021 07:06:07 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlZ-00GKcv-Hq for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:43 +0000 Received: by mail-pf1-x42f.google.com with SMTP id 17so4853848pfz.4 for ; Thu, 01 Jul 2021 00:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IUAH2jgY5wVOZIiKFngid61MVHuRsgwO4HTH9luZp7E=; b=S1h+WKCIH7M7W1KFX/1zZVBlWobKX00HqD3gELRr/49lgztgD+ItxYwXm+vuHIY064 r0QCF+MxS/4VMv4GqMw+it/d1FT5H2ax2rVvDj5X9xMR/UxeGTxFAaU3PJpJSWZy1nFw zFneQwuUO6GYF0nEFiSoduMz69iVRD2aScCS0= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IUAH2jgY5wVOZIiKFngid61MVHuRsgwO4HTH9luZp7E=; b=NzeAxXwcWpMTazITxTX/r54Y8PxHvR/V+79/CLA0ROFDAFi8cc6NmhaYJHm+726aMO Ya8PH//qqHoqW/Rc4lYcLsRV/f4Fi3nS5bAbeGcQekqD0DNPLYnpc5u/yToPPzg/LZzT d8HOLyBPUFb6RFGMZbJQKh+Q3U3uxFmhV9UKkFQL0RMAYqFIo3rrTpIdfLpMp9C4IpzC tD09WHYv0hJVtB6ohEJk+oZHbi67PClHAy8/NjWDjkjVEFpqq62YuDWkFAkxtNmcvh4H III+oAzQ1MYqjoyPQVoeeUZVAjVvq656DP23P+LrSMkkm/NObaRAD/THgOWhE/uqVxU+ dyRg== X-Gm-Message-State: AOAM533mgM4IdtBCViK5EpVRk98U+Zsa2UTZ34r6HYA//AJXZS5KsEWp jPnAkUHcCENJ+UVu41kPaiVNmvID+ogv+Q== X-Google-Smtp-Source: ABdhPJzbeULeCtqLvGwiFneEEC4G53aJcti4RPiURHYLoYSUN787PaWKYXRuGWr96vR7etgSrWZSxQ== X-Received: by 2002:a05:6a00:5e:b029:30f:d0d3:214e with SMTP id i30-20020a056a00005eb029030fd0d3214emr8018325pfk.29.1625123140309; Thu, 01 Jul 2021 00:05:40 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:39 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 3/7] wpa_supplicant: src: Replace Sane with Valid. Date: Thu, 1 Jul 2021 00:05:24 -0700 Message-Id: <20210701070528.2125299-4-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000541_635418_79FC78D1 X-CRM114-Status: GOOD ( 17.32 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replace the word Sane with Valid which is inclusive. Signed-off-by: Arowa Suliman --- src/drivers/driver.h | 4 ++-- src/drivers/driver_common.c | 2 +- src/drivers/driver_nl80211_capa.c | 2 +- wpa_supplicant/wpa_supplicant.c | 2 +- 4 [...] Content analysis details: (-0.4 points, 5.0 required) 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:42f 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replace the word Sane with Valid which is inclusive. Signed-off-by: Arowa Suliman --- src/drivers/driver.h | 4 ++-- src/drivers/driver_common.c | 2 +- src/drivers/driver_nl80211_capa.c | 2 +- wpa_supplicant/wpa_supplicant.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 804ac6806..4148ab07b 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1894,11 +1894,11 @@ struct wpa_driver_capa { */ #define WPA_DRIVER_FLAGS_P2P_MGMT_AND_NON_P2P 0x00002000 /** - * Driver is known to use sane error codes, i.e., when it indicates that + * Driver is known to use valid error codes, i.e., when it indicates that * something (e.g., association) fails, there was indeed a failure and the * operation does not end up getting completed successfully later. */ -#define WPA_DRIVER_FLAGS_SANE_ERROR_CODES 0x00004000 +#define WPA_DRIVER_FLAGS_VALID_ERROR_CODES 0x00004000 /** Driver supports off-channel TX */ #define WPA_DRIVER_FLAGS_OFFCHANNEL_TX 0x00008000 /** Driver indicates TX status events for EAPOL Data frames */ diff --git a/src/drivers/driver_common.c b/src/drivers/driver_common.c index a7ebe9566..1cb976011 100644 --- a/src/drivers/driver_common.c +++ b/src/drivers/driver_common.c @@ -268,7 +268,7 @@ const char * driver_flag_to_string(u64 flag) DF2S(P2P_CAPABLE); DF2S(AP_TEARDOWN_SUPPORT); DF2S(P2P_MGMT_AND_NON_P2P); - DF2S(SANE_ERROR_CODES); + DF2S(VALID_ERROR_CODES); DF2S(OFFCHANNEL_TX); DF2S(EAPOL_TX_STATUS); DF2S(DEAUTH_TX_STATUS); diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c index cd596e311..83868b78e 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -1389,7 +1389,7 @@ int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv) WPA_DRIVER_AUTH_SHARED | WPA_DRIVER_AUTH_LEAP; - drv->capa.flags |= WPA_DRIVER_FLAGS_SANE_ERROR_CODES; + drv->capa.flags |= WPA_DRIVER_FLAGS_VALID_ERROR_CODES; drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE; drv->capa.flags |= WPA_DRIVER_FLAGS_EAPOL_TX_STATUS; diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 0d9b9caa5..89826ca26 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -3868,7 +3868,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit) if (ret < 0) { wpa_msg(wpa_s, MSG_INFO, "Association request to the driver " "failed"); - if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SANE_ERROR_CODES) { + if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_VALID_ERROR_CODES) { /* * The driver is known to mean what is saying, so we * can stop right here; the association will not From patchwork Thu Jul 1 07:05:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499393 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=a3vS/UOY; 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=ErDbhSVk; 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 4GFq6S29ZLz9sVb for ; Thu, 1 Jul 2021 17:07:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WABnTrkh/EUu9P27D56MCbPFwGsCljdjjf5LKI7RDHw=; b=a3vS/UOYgIVxrn x2hPIX66LPGwg6zARZUOLmr+JE41Kue93Qk26zstB5v3u7IQ62tYSgz2gk0xFBDdDXOZgqsKDHKl4 sdgQJ4ls5vspWjMGPSE9D5kVLgZ8PMhXSQESxEcIShq11ZH3v9b/pQ2vbSB56s1TbmnEehaYcx5yN tnXXUl7PnMDgJ2BB0GRP/C/TtZqLVYC/ZIPqtrXE2c/I5u/y1srzviSJFlU4Dq46TNx7TRT+HmOLi T1dOGLTcrEGrkwMnQjcnejYv0iZQj23qiSSLY0JBEos5F9XkMV+KiSGO3dHkbV45pJ+yCSy5Ll+Qz rFURRF/AoUAOD1wNPu1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqm8-00GKmX-7w; Thu, 01 Jul 2021 07:06:16 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqla-00GKdK-6l for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:44 +0000 Received: by mail-pl1-x62e.google.com with SMTP id a14so2916491pls.4 for ; Thu, 01 Jul 2021 00:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZaXAfzfyPDnaFbmfcsYXNtKj8yjQWIL2mmmb35RLceo=; b=ErDbhSVk/z4HVtZ+jTcHF7UWwmkIcQl9VzZwjwQ5B4vfpV7q0DZRWgOt5syyq3quJv yTaWQdJoiCmdW8iclZCaBR1bZGvKh+rvcDRPeEz7K8KrONKNLIllNG2bGWx19ZXt94Vg aUp9qjXiwsIZaiCjlZ6A869WDlIBzxqCBmN04= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZaXAfzfyPDnaFbmfcsYXNtKj8yjQWIL2mmmb35RLceo=; b=bAqE+7xAcRIN2XT8OHgYyfn9brT4UvZ37QV2mbvgsmNrXBgKdognQ6hBa1Cwhm0LlH 6f7kMiI7IiT6I4fMQgTesQnSYBvfj/SLR9OPfmucT86qbSeHRL/a1/eyOYHwFCr+tAng TnJJQMTLaV3DK0MWFVFeoFXZDyOj6oWFbDrHDXiuI4YW4pE5aXUomCBmQ/saLacfN5f1 zhLE52yRU/VREbPB21QVxVCG0VjIYjNTVPcSyOhFKsXclMAjdY7v/m4wFmT2niKdNy/q KXynMswEbWkr0154hHDWGwaI/pdR4VpCgnqq9T2hbBjZ4o/WQNnqV86tAwlFRJwgN5QS tKsw== X-Gm-Message-State: AOAM531+KVuw8KHVYupL+bUNmuP2ZAIp1BKS5b8G6laiovd3jvf0q5Jr Bex0O/o9fSEZH0Cj/mPw1qGSKZkL2tVkMA== X-Google-Smtp-Source: ABdhPJzeSVClHe2pzPQLt3bWZUc+hrYKh/VCzOPj0U4Sm8PkVBOonL3W/DKFx88BO2y8tgx3MkeG5A== X-Received: by 2002:a17:90a:4dca:: with SMTP id r10mr4337472pjl.94.1625123141636; Thu, 01 Jul 2021 00:05:41 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:41 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 4/7] wpa_supplicant: src: tests: Replace Sanity. Date: Thu, 1 Jul 2021 00:05:25 -0700 Message-Id: <20210701070528.2125299-5-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000542_303903_7BAB88F5 X-CRM114-Status: GOOD ( 19.15 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the word Sanity with the inclusive word Validity. Signed-off-by: Arowa Suliman --- src/ap/wpa_auth_ft.c | 4 ++-- src/p2p/p2p_pd.c | 2 +- src/pae/ieee802_1x_kay.c | 8 ++++---- tests/hwsim/test_fst_config.py | 2 +- tests/hwsim/test [...] Content analysis details: (-0.4 points, 5.0 required) 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:62e 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replaced the word Sanity with the inclusive word Validity. Signed-off-by: Arowa Suliman --- src/ap/wpa_auth_ft.c | 4 ++-- src/p2p/p2p_pd.c | 2 +- src/pae/ieee802_1x_kay.c | 8 ++++---- tests/hwsim/test_fst_config.py | 2 +- tests/hwsim/test_wmediumd.py | 2 +- wpa_supplicant/ctrl_iface.c | 2 +- wpa_supplicant/p2p_supplicant_sd.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index e80086b93..f91a2d2d5 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -455,7 +455,7 @@ static int wpa_ft_rrb_lin(const struct tlv_list *tlvs1, pos += wpa_ft_tlv_lin(tlvs2, pos, endpos); pos += wpa_ft_vlan_lin(vlan, pos, endpos); - /* sanity check */ + /* validity check */ if (pos != endpos) { wpa_printf(MSG_ERROR, "FT: Length error building RRB"); goto err; @@ -3590,7 +3590,7 @@ int wpa_ft_action_rx(struct wpa_state_machine *sm, const u8 *data, size_t len) } /* - * Do some sanity checking on the target AP address (not own and not + * Do some validity checking on the target AP address (not own and not * broadcast. This could be extended to filter based on a list of known * APs in the MD (if such a list were configured). */ diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index 05fd59349..338b47e4e 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -1425,7 +1425,7 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa, * Save the reported channel list and operating frequency. * Note that the specification mandates that the responder * should include in the channel list only channels reported by - * the initiator, so this is only a sanity check, and if this + * the initiator, so this is only a validity check, and if this * fails the flow would continue, although it would probably * fail. Same is true for the operating channel. */ diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c index 2fe88ac0c..7688a00a1 100644 --- a/src/pae/ieee802_1x_kay.c +++ b/src/pae/ieee802_1x_kay.c @@ -3057,11 +3057,11 @@ int ieee802_1x_kay_enable_new_info(struct ieee802_1x_kay *kay) /** - * ieee802_1x_kay_mkpdu_sanity_check - - * Sanity checks specified in IEEE Std 802.1X-2010, 11.11.2 (Validation of + * ieee802_1x_kay_mkpdu_validity_check - + * Validity checks specified in IEEE Std 802.1X-2010, 11.11.2 (Validation of * MKPDUs) */ -static int ieee802_1x_kay_mkpdu_sanity_check(struct ieee802_1x_kay *kay, +static int ieee802_1x_kay_mkpdu_validity_check(struct ieee802_1x_kay *kay, const u8 *buf, size_t len) { struct ieee8023_hdr *eth_hdr; @@ -3215,7 +3215,7 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay, wpa_printf(MSG_DEBUG, "KaY: Decode received MKPDU (ifname=%s)", kay->if_name); - if (ieee802_1x_kay_mkpdu_sanity_check(kay, buf, len)) + if (ieee802_1x_kay_mkpdu_validity_check(kay, buf, len)) return -1; /* handle basic parameter set */ diff --git a/tests/hwsim/test_fst_config.py b/tests/hwsim/test_fst_config.py index 981340141..66b5a729c 100644 --- a/tests/hwsim/test_fst_config.py +++ b/tests/hwsim/test_fst_config.py @@ -269,7 +269,7 @@ def parse_ies(iehex, el=-1): iel = [iehex[i:i + 2] for i in range(0, len(iehex), 2)] for i in range(0, len(iel)): iel[i] = int(iel[i], 16) - # Sanity check + # Validity check i = 0 res = [] while i < len(iel): diff --git a/tests/hwsim/test_wmediumd.py b/tests/hwsim/test_wmediumd.py index ad38f03ce..8243e7ce3 100644 --- a/tests/hwsim/test_wmediumd.py +++ b/tests/hwsim/test_wmediumd.py @@ -1,4 +1,4 @@ -# wmediumd sanity checks +# wmediumd validity checks # Copyright (c) 2015, Intel Deutschland GmbH # # This software may be distributed under the terms of the BSD license. diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 4e8b30aba..2b3243e5a 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -5918,7 +5918,7 @@ static struct p2ps_provision * p2p_parse_asp_provision_cmd(const char *cmd) for (i = 0; p2ps_prov->cpt_priority[i]; i++) p2ps_prov->cpt_mask |= p2ps_prov->cpt_priority[i]; - /* force conncap with tstCap (no sanity checks) */ + /* force conncap with tstCap (no validity checks) */ pos = os_strstr(cmd, "tstCap="); if (pos) { role = strtol(pos + 7, NULL, 16); diff --git a/wpa_supplicant/p2p_supplicant_sd.c b/wpa_supplicant/p2p_supplicant_sd.c index f8675e68b..b400cbaca 100644 --- a/wpa_supplicant/p2p_supplicant_sd.c +++ b/wpa_supplicant/p2p_supplicant_sd.c @@ -826,7 +826,7 @@ static void wpas_sd_p2ps_serv_response(struct wpa_supplicant *wpa_s, size_t buf_len; u8 svc_len; - /* Sanity check fixed length+svc_str */ + /* Validity check fixed length+svc_str */ if (6 >= tlv_end - pos) break; svc_len = pos[6]; @@ -854,7 +854,7 @@ static void wpas_sd_p2ps_serv_response(struct wpa_supplicant *wpa_s, buf_len = WPA_GET_LE16(pos); pos += sizeof(u16); - /* Sanity check buffer length */ + /* Validity check buffer length */ if (buf_len > (unsigned int) (tlv_end - pos)) break; From patchwork Thu Jul 1 07:05:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499394 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=SQTnkeOa; 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=FM/MiFx1; 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 4GFq6j6Zwhz9sVb for ; Thu, 1 Jul 2021 17:07:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d1O5whyQWZE/OuXl7GbJl+gONrY5l216eMkqtLokMD8=; b=SQTnkeOaOZEQN/ raLltpiJcPGi1BYIZAuRocQROwkSvP2lF31PGhhvlbhQSiWeGh3MlG38G+VaT9nQiuV0jWHPIQWVB snNWDt1MBYYaRzzIezneP5Es95T6qqZhv2/34yHyKObyKP+68amERZJZmsxU3oAmRg5Vp7UJl2sTf kPWq70iv/hXqBZAUTmjlc/zo9MdimnU7/aVQUSnVZOyRHEcgHk3XLUeIjdoGywbRo2VbsDYeVAIAi d+7YIzzv1jzMmGlNM6EJ3QM7L1gdRiw+f9P623QNl75Td11VF8SglssBxFf8Zz/JsMS8SQfjlAZpq Gl/QSnLf50fwS+4bZy7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqmK-00GKrE-Rh; Thu, 01 Jul 2021 07:06:28 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlc-00GKds-Fi for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:46 +0000 Received: by mail-pl1-x634.google.com with SMTP id z4so3123903plg.8 for ; Thu, 01 Jul 2021 00:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bVTluO95DZ10AdTP+2P3pmfxjYnPNJtRgG5RQ/IKI18=; b=FM/MiFx1WKEVigGfnSGc/b/B+IhVDd/V1QbCV+kNmSxSese47mbdJ92We84ZRsGrfs uxC54bmlDvm8M819ZG+dp8X/soRv6xDQdAlEkKSdm+B03NmcALxlecbjQ4Kbv4oLu+oM r/R+tHdHfwtGvGd9PvEJX28Zv9/ceEoHtVG6Q= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=bVTluO95DZ10AdTP+2P3pmfxjYnPNJtRgG5RQ/IKI18=; b=uIcaNVmDphqxAMs9KXXBaSgQ1JHfJK8W94C+mTT5XgMsUaVyv2afPEgTtes43sA8O2 PksOcKCbS8lUa3RhZ/pfR8JCMQGgYvplYhuLOWcLTFb4efDC4ZlP5t1DDTwvnE/GXtr3 eI2+8TtNon01IsmKElxlOP6SSWsaQONIz0o97ArhmiKhAJVa0+zpaPIiQureT2ViTg6/ 3AlmqyK37tsj48TpZvfsdk3FNwRuMKpb1B5h/b+yXnpTHotE/BvcZfQ0HE9V3hXhHAqx HHqMqvG0aO91nmatjaIHbVpMv4T+1AD66LHm6SzUJGHJOzoeaFl8ULg9E50C6/GFS0qA yzhw== X-Gm-Message-State: AOAM533uZLIsWasT0F3AfXuhjn1Rz/mwhXQG43pCJc1jeLZl5XQQ/0Pw YJIn1STiiVCagQMx9fYd1gKY5E22ctTlRg== X-Google-Smtp-Source: ABdhPJwqHIN1F34+sTwYvgZFuDbzRZa/diUy/bfKBt/t88F5eMCuL4qbDuv3elN8Cx4iZH45BE4mqw== X-Received: by 2002:a17:90a:8e82:: with SMTP id f2mr8690875pjo.177.1625123143243; Thu, 01 Jul 2021 00:05:43 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:42 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 5/7] doc: src: Replace Master with Main. Date: Thu, 1 Jul 2021 00:05:26 -0700 Message-Id: <20210701070528.2125299-6-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000544_572214_6834600C X-CRM114-Status: GOOD ( 17.62 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the words Master with the inclusive word Main. Signed-off-by: Arowa Suliman --- doc/doxygen.conf | 2 +- src/common/qca-vendor.h | 4 ++-- src/drivers/driver_hostap.h | 4 ++-- src/p2p/p2p.h | 2 +- src/utils/pcsc_funcs.c | 4 ++-- [...] Content analysis details: (-0.4 points, 5.0 required) 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:634 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replaced the words Master with the inclusive word Main. Signed-off-by: Arowa Suliman --- doc/doxygen.conf | 2 +- src/common/qca-vendor.h | 4 ++-- src/drivers/driver_hostap.h | 4 ++-- src/p2p/p2p.h | 2 +- src/utils/pcsc_funcs.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/doxygen.conf b/doc/doxygen.conf index 3f0117393..b283b74ba 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -883,7 +883,7 @@ HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# it should be included in the main .chm file (NO). GENERATE_CHI = NO diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index ce588cc00..28ee871ca 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -551,10 +551,10 @@ enum qca_radiotap_vendor_ids { * sent in the event. * @QCA_NL80211_VENDOR_SUBCMD_MPTA_HELPER_CONFIG: This sub command is used to * improve the success rate of Zigbee joining network. - * Due to PTA master limitation, Zigbee joining network success rate is + * Due to PTA main limitation, Zigbee joining network success rate is * low while WLAN is working. The WLAN driver needs to configure some * parameters including Zigbee state and specific WLAN periods to enhance - * PTA master. All these parameters are delivered by the attributes + * PTA main. All these parameters are delivered by the attributes * defined in enum qca_mpta_helper_vendor_attr. * @QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING: This sub command is used to * implement Beacon frame reporting feature. diff --git a/src/drivers/driver_hostap.h b/src/drivers/driver_hostap.h index 4c1e6d69f..ab3d92ca5 100644 --- a/src/drivers/driver_hostap.h +++ b/src/drivers/driver_hostap.h @@ -55,8 +55,8 @@ enum { PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16, PRISM2_PARAM_HOST_ENCRYPT = 17, PRISM2_PARAM_HOST_DECRYPT = 18, - PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19, - PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20, + PRISM2_PARAM_BUS_MAIN_THRESHOLD_RX = 19, + PRISM2_PARAM_BUS_MAIN_THRESHOLD_TX = 20, PRISM2_PARAM_HOST_ROAMING = 21, PRISM2_PARAM_BCRX_STA_KEY = 22, PRISM2_PARAM_IEEE_802_1X = 23, diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index f606fbb14..af13b28bd 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -486,7 +486,7 @@ struct p2p_config { * case for this is to include passive-scan channels on devices that may * not know their current location and have configured most channels to * not allow initiation of radition (i.e., another device needs to take - * master responsibilities). + * main responsibilities). */ struct p2p_channels cli_channels; diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c index 383ed3ddf..ba3924d06 100644 --- a/src/utils/pcsc_funcs.c +++ b/src/utils/pcsc_funcs.c @@ -90,9 +90,9 @@ /* GSM files * File type in first octet: - * 3F = Master File + * 3F = Main File * 7F = Dedicated File - * 2F = Elementary File under the Master File + * 2F = Elementary File under the Main File * 6F = Elementary File under a Dedicated File */ #define SCARD_FILE_MF 0x3F00 From patchwork Thu Jul 1 07:05:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499395 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=lzPgJgUj; 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=Jgl5J9wl; 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 4GFq7C671Fz9sVb for ; Thu, 1 Jul 2021 17:08:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=erkBPzqF3xAHeIs5HqncwYNqC/jhXfGVBaWt+wf4rfI=; b=lzPgJgUjPKXOCW 0bwAmP6+sXvkjFc/ZTnu5kfGhLopWWZvx1w/CTDdmsAW/IlePlElJsQ5caJ5qjpZX6pUx7vFkQOsn /ByyYsMqf25Uu4xqgJaotIJ4DVrTiwTTTwuiEku370XetDf1Tze6JnRPGqOjY/5QjFYkv+vCdTxN9 uf7k1rNjeRD5PiRCjTuOfPZjc7EgKp/o25jVc9xv48sbFuUYaAgJVvVbL1BhfowA/n+aay6lBTqC9 VU84BFmhlkDeyUBlMODGeu6vEVRXE+KTg7crU69jlSOdUxVrWVMqauCfPeYjYyAcnNTHLLCbEAEFl yBjUZQA6JPOXso4KFE8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqmY-00GKxN-4C; Thu, 01 Jul 2021 07:06:42 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqle-00GKeO-2u for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:49 +0000 Received: by mail-pl1-x62f.google.com with SMTP id b5so3138341plg.2 for ; Thu, 01 Jul 2021 00:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mes6STUxrabCuJ+kQPTkuMEJmAEXbOQuJ9hUpxAQIbw=; b=Jgl5J9wl6qQnzu53qje1gm6VRxxW3B4PWnlH55iAtJk1b8GuuNM3nB56jw65Cjf6LL HIgT58gLw3HpnQaPA41OeIY9X4CGdsXJ62LQaGNngL/W2MTe2oac+MKImkgtqGuFeRtW TiFrNPXyFt2MhvaC6P/mSfEg+8eODCq+0sLH4= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mes6STUxrabCuJ+kQPTkuMEJmAEXbOQuJ9hUpxAQIbw=; b=oHOVvDJKpJvIcSiJ6ZCzG8tIPnj6agp1FM5+QgQdb2fVL2qFRRoRVTmXUbMP4SwFlR f/sH/RuXZ/1hzdaHudNBD2/+Gzyo7nFT9hZ+YGfHXJZ79FL99X7YuRWHRaT+Gi/MTdz3 lP5oYY2CCugTjZOeZip9zhIaHPQJR0yioS/kkkVyVl18u7tTqkaSp4dW/o5BbgilyYy8 6w/fVvfD2jqbaDUztxqUojnbJPAYSBvsRUyo1RXSv+Ttseqc0N6GqKpUOY8FWj8aCT2p +rxDfEuT3cyRrrirEVMlnBohGUU+8K2UOYAwAx/TNiI3/m4LGARD8NTPZecbeVC+Yfmz RJkg== X-Gm-Message-State: AOAM531ebJI+Z0mnUN9zgyI841UxaeQDBxCi1yphhgoNCpHr5QymzOMv Y0bT3/miPThnbZgrEhzrPh3noFsK6MRdYw== X-Google-Smtp-Source: ABdhPJw39+8Oj3132rxzG7IwpjMvRNEw+sTf1WRJYy61TzlI0Mvzpgdkk4Uj9m2cc286AmWygDEgRw== X-Received: by 2002:a17:90a:66c9:: with SMTP id z9mr44823246pjl.122.1625123144518; Thu, 01 Jul 2021 00:05:44 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:44 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 6/7] src: wlantest: Replace Dummy with Stub Part 1. Date: Thu, 1 Jul 2021 00:05:27 -0700 Message-Id: <20210701070528.2125299-7-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000546_212507_9E3637EA X-CRM114-Status: GOOD ( 25.76 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the word dummy with the inclusive word Stub. Signed-off-by: Arowa Suliman --- src/ap/wpa_auth.c | 18 +++++++------- src/ap/wpa_auth_ft.c | 12 ++++----- src/common/qca-vendor.h | 4 +-- src/common/sae.c | 12 ++++----- src/cryp [...] Content analysis details: (-0.4 points, 5.0 required) 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:62f 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal information -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replaced the word dummy with the inclusive word Stub. Signed-off-by: Arowa Suliman --- src/ap/wpa_auth.c | 18 +++++++------- src/ap/wpa_auth_ft.c | 12 ++++----- src/common/qca-vendor.h | 4 +-- src/common/sae.c | 12 ++++----- src/crypto/crypto_internal-rsa.c | 2 +- src/crypto/random.c | 42 ++++++++++++++++---------------- src/drivers/driver_ndis.c | 16 ++++++------ src/drivers/driver_nl80211.c | 2 +- src/eap_peer/eap_proxy_dummy.c | 2 +- src/eap_peer/eap_teap.c | 8 +++--- src/eap_peer/eap_tls_common.h | 2 +- src/l2_packet/l2_packet_none.c | 2 +- wlantest/inject.c | 24 +++++++++--------- wlantest/rx_eapol.c | 4 +-- 14 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index 83805681e..6d60f2629 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -2742,7 +2742,7 @@ static struct wpabuf * fils_prepare_plainbuf(struct wpa_state_machine *sm, struct wpabuf *plain; u8 *len, *tmp, *tmp2; u8 hdr[2]; - u8 *gtk, dummy_gtk[32]; + u8 *gtk, stub_gtk[32]; size_t gtk_len; struct wpa_group *gsm; size_t plain_len; @@ -2785,11 +2785,11 @@ static struct wpabuf * fils_prepare_plainbuf(struct wpa_state_machine *sm, * Provide unique random GTK to each STA to prevent use * of GTK in the BSS. */ - if (random_get_bytes(dummy_gtk, gtk_len) < 0) { + if (random_get_bytes(stub_gtk, gtk_len) < 0) { wpabuf_clear_free(plain); return NULL; } - gtk = dummy_gtk; + gtk = stub_gtk; } hdr[0] = gsm->GN & 0x03; hdr[1] = 0; @@ -3372,7 +3372,7 @@ static u8 * replace_ie(const char *name, const u8 *old_buf, size_t *len, u8 eid, SM_STATE(WPA_PTK, PTKINITNEGOTIATING) { - u8 rsc[WPA_KEY_RSC_LEN], *_rsc, *gtk, *kde = NULL, *pos, dummy_gtk[32]; + u8 rsc[WPA_KEY_RSC_LEN], *_rsc, *gtk, *kde = NULL, *pos, stub_gtk[32]; size_t gtk_len, kde_len, wpa_ie_len; struct wpa_group *gsm = sm->group; u8 *wpa_ie; @@ -3458,9 +3458,9 @@ SM_STATE(WPA_PTK, PTKINITNEGOTIATING) * Provide unique random GTK to each STA to prevent use * of GTK in the BSS. */ - if (random_get_bytes(dummy_gtk, gtk_len) < 0) + if (random_get_bytes(stub_gtk, gtk_len) < 0) goto done; - gtk = dummy_gtk; + gtk = stub_gtk; } gtkidx = gsm->GN; _rsc = rsc; @@ -3853,7 +3853,7 @@ SM_STATE(WPA_PTK_GROUP, REKEYNEGOTIATING) const u8 *kde; u8 *kde_buf = NULL, *pos, hdr[2]; size_t kde_len; - u8 *gtk, dummy_gtk[32]; + u8 *gtk, stub_gtk[32]; struct wpa_auth_config *conf = &sm->wpa_auth->conf; SM_ENTRY_MA(WPA_PTK_GROUP, REKEYNEGOTIATING, wpa_ptk_group); @@ -3885,9 +3885,9 @@ SM_STATE(WPA_PTK_GROUP, REKEYNEGOTIATING) * Provide unique random GTK to each STA to prevent use * of GTK in the BSS. */ - if (random_get_bytes(dummy_gtk, gsm->GTK_len) < 0) + if (random_get_bytes(stub_gtk, gsm->GTK_len) < 0) return; - gtk = dummy_gtk; + gtk = stub_gtk; } if (sm->wpa == WPA_VERSION_WPA2) { kde_len = 2 + RSN_SELECTOR_LEN + 2 + gsm->GTK_len + diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index f91a2d2d5..fef1104d2 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -2259,7 +2259,7 @@ static u8 * wpa_ft_igtk_subelem(struct wpa_state_machine *sm, size_t *len) const u8 *kek, *igtk; size_t kek_len; size_t igtk_len; - u8 dummy_igtk[WPA_IGTK_MAX_LEN]; + u8 stub_igtk[WPA_IGTK_MAX_LEN]; if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) { kek = sm->PTK.kek2; @@ -2292,11 +2292,11 @@ static u8 * wpa_ft_igtk_subelem(struct wpa_state_machine *sm, size_t *len) * Provide unique random IGTK to each STA to prevent use of * IGTK in the BSS. */ - if (random_get_bytes(dummy_igtk, igtk_len / 8) < 0) { + if (random_get_bytes(stub_igtk, igtk_len / 8) < 0) { os_free(subelem); return NULL; } - igtk = dummy_igtk; + igtk = stub_igtk; } if (aes_wrap(kek, kek_len, igtk_len / 8, igtk, pos)) { wpa_printf(MSG_DEBUG, @@ -2319,7 +2319,7 @@ static u8 * wpa_ft_bigtk_subelem(struct wpa_state_machine *sm, size_t *len) const u8 *kek, *bigtk; size_t kek_len; size_t bigtk_len; - u8 dummy_bigtk[WPA_IGTK_MAX_LEN]; + u8 stub_bigtk[WPA_IGTK_MAX_LEN]; if (wpa_key_mgmt_fils(sm->wpa_key_mgmt)) { kek = sm->PTK.kek2; @@ -2352,11 +2352,11 @@ static u8 * wpa_ft_bigtk_subelem(struct wpa_state_machine *sm, size_t *len) * Provide unique random BIGTK to each OSEN STA to prevent use * of BIGTK in the BSS. */ - if (random_get_bytes(dummy_bigtk, bigtk_len / 8) < 0) { + if (random_get_bytes(stub_bigtk, bigtk_len / 8) < 0) { os_free(subelem); return NULL; } - bigtk = dummy_bigtk; + bigtk = stub_bigtk; } if (aes_wrap(kek, kek_len, bigtk_len / 8, bigtk, pos)) { wpa_printf(MSG_DEBUG, diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index 28ee871ca..ab3af63c2 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -944,7 +944,7 @@ enum qca_wlan_vendor_attr { * use QCA_WLAN_VENDOR_ATTR_SETBAND_MASK instead. */ QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE = 12, - /* Dummy (NOP) attribute for 64 bit padding */ + /* Stub (NOP) attribute for 64 bit padding */ QCA_WLAN_VENDOR_ATTR_PAD = 13, /* Unique FTM session cookie (Unsigned 64 bit). Specified in * QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION. Reported in @@ -3342,7 +3342,7 @@ enum qca_vendor_attr_loc_session_status { * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INITIATOR_TOA_ERR: TOA error measured by * initiator. Not always provided. * See IEEE P802.11-REVmc/D7.0, 9.6.8.33 for more information. - * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PAD: Dummy attribute for padding. + * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PAD: Stub attribute for padding. */ enum qca_wlan_vendor_attr_ftm_meas { QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INVALID, diff --git a/src/common/sae.c b/src/common/sae.c index 74920a78e..b768c22fa 100644 --- a/src/common/sae.c +++ b/src/common/sae.c @@ -286,7 +286,7 @@ static int sae_derive_pwe_ecc(struct sae_data *sae, const u8 *addr1, u8 addrs[2 * ETH_ALEN]; const u8 *addr[2]; size_t len[2]; - u8 *dummy_password, *tmp_password; + u8 *stub_password, *tmp_password; int pwd_seed_odd = 0; u8 prime[SAE_MAX_ECC_PRIME_LEN]; size_t prime_len; @@ -301,10 +301,10 @@ static int sae_derive_pwe_ecc(struct sae_data *sae, const u8 *addr1, os_memset(x_bin, 0, sizeof(x_bin)); - dummy_password = os_malloc(password_len); + stub_password = os_malloc(password_len); tmp_password = os_malloc(password_len); - if (!dummy_password || !tmp_password || - random_get_bytes(dummy_password, password_len) < 0) + if (!stub_password || !tmp_password || + random_get_bytes(stub_password, password_len) < 0) goto fail; prime_len = sae->tmp->prime_len; @@ -354,7 +354,7 @@ static int sae_derive_pwe_ecc(struct sae_data *sae, const u8 *addr1, } wpa_printf(MSG_DEBUG, "SAE: counter = %03u", counter); - const_time_select_bin(found, dummy_password, password, + const_time_select_bin(found, stub_password, password, password_len, tmp_password); if (hmac_sha256_vector(addrs, sizeof(addrs), 2, addr, len, pwd_seed) < 0) @@ -415,7 +415,7 @@ static int sae_derive_pwe_ecc(struct sae_data *sae, const u8 *addr1, fail: crypto_bignum_deinit(qr, 0); crypto_bignum_deinit(qnr, 0); - os_free(dummy_password); + os_free(stub_password); bin_clear_free(tmp_password, password_len); crypto_bignum_deinit(x, 1); os_memset(x_bin, 0, sizeof(x_bin)); diff --git a/src/crypto/crypto_internal-rsa.c b/src/crypto/crypto_internal-rsa.c index dc7f350af..0c5ceadb8 100644 --- a/src/crypto/crypto_internal-rsa.c +++ b/src/crypto/crypto_internal-rsa.c @@ -14,7 +14,7 @@ #include "tls/pkcs1.h" #include "tls/pkcs8.h" -/* Dummy structures; these are just typecast to struct crypto_rsa_key */ +/* Stub structures; these are just typecast to struct crypto_rsa_key */ struct crypto_public_key; struct crypto_private_key; diff --git a/src/crypto/random.c b/src/crypto/random.c index 1cabf3f4b..548b60dba 100644 --- a/src/crypto/random.c +++ b/src/crypto/random.c @@ -49,9 +49,9 @@ static u32 pool[POOL_WORDS]; static unsigned int input_rotate = 0; static unsigned int pool_pos = 0; -static u8 dummy_key[20]; +static u8 stub_key[20]; #ifdef __linux__ -static size_t dummy_key_avail = 0; +static size_t stub_key_avail = 0; static int random_fd = -1; #endif /* __linux__ */ static unsigned int own_pool_ready = 0; @@ -109,13 +109,13 @@ static void random_extract(u8 *out) u32 buf[POOL_WORDS / 2]; /* First, add hash back to pool to make backtracking more difficult. */ - hmac_sha1(dummy_key, sizeof(dummy_key), (const u8 *) pool, + hmac_sha1(stub_key, sizeof(stub_key), (const u8 *) pool, sizeof(pool), hash); random_mix_pool(hash, sizeof(hash)); /* Hash half the pool to extra data */ for (i = 0; i < POOL_WORDS / 2; i++) buf[i] = pool[(pool_pos - i) & POOL_WORDS_MASK]; - hmac_sha1(dummy_key, sizeof(dummy_key), (const u8 *) buf, + hmac_sha1(stub_key, sizeof(stub_key), (const u8 *) buf, sizeof(buf), hash); /* * Fold the hash to further reduce any potential output pattern. @@ -227,7 +227,7 @@ int random_pool_ready(void) * some key derivation operations to proceed. */ - if (dummy_key_avail == sizeof(dummy_key)) + if (stub_key_avail == sizeof(stub_key)) return 1; /* Already initialized - good to continue */ /* @@ -238,8 +238,8 @@ int random_pool_ready(void) */ #ifdef CONFIG_GETRANDOM - res = getrandom(dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail, GRND_NONBLOCK); + res = getrandom(stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail, GRND_NONBLOCK); if (res < 0) { if (errno == ENOSYS) { wpa_printf(MSG_DEBUG, @@ -263,8 +263,8 @@ int random_pool_ready(void) return -1; } - res = read(fd, dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail); + res = read(fd, stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail); if (res < 0) { wpa_printf(MSG_ERROR, "random: Cannot read from /dev/random: %s", @@ -275,10 +275,10 @@ int random_pool_ready(void) } wpa_printf(MSG_DEBUG, "random: Got %u/%u random bytes", (unsigned) res, - (unsigned) (sizeof(dummy_key) - dummy_key_avail)); - dummy_key_avail += res; + (unsigned) (sizeof(stub_key) - stub_key_avail)); + stub_key_avail += res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { if (own_pool_ready < MIN_READY_MARK) own_pool_ready = MIN_READY_MARK; random_write_entropy(); @@ -287,7 +287,7 @@ int random_pool_ready(void) wpa_printf(MSG_INFO, "random: Only %u/%u bytes of strong " "random data available", - (unsigned) dummy_key_avail, (unsigned) sizeof(dummy_key)); + (unsigned) stub_key_avail, (unsigned) sizeof(stub_key)); if (own_pool_ready >= MIN_READY_MARK || total_collected + 10 * own_pool_ready > MIN_COLLECT_ENTROPY) { @@ -331,13 +331,13 @@ static void random_read_fd(int sock, void *eloop_ctx, void *sock_ctx) { ssize_t res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { random_close_fd(); return; } - res = read(sock, dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail); + res = read(sock, stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail); if (res < 0) { wpa_printf(MSG_ERROR, "random: Cannot read from /dev/random: " "%s", strerror(errno)); @@ -346,10 +346,10 @@ static void random_read_fd(int sock, void *eloop_ctx, void *sock_ctx) wpa_printf(MSG_DEBUG, "random: Got %u/%u bytes from /dev/random", (unsigned) res, - (unsigned) (sizeof(dummy_key) - dummy_key_avail)); - dummy_key_avail += res; + (unsigned) (sizeof(stub_key) - stub_key_avail)); + stub_key_avail += res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { random_close_fd(); if (own_pool_ready < MIN_READY_MARK) own_pool_ready = MIN_READY_MARK; @@ -440,9 +440,9 @@ void random_init(const char *entropy_file) #ifdef CONFIG_GETRANDOM { - u8 dummy; + u8 stub; - if (getrandom(&dummy, 0, GRND_NONBLOCK) == 0 || + if (getrandom(&stub, 0, GRND_NONBLOCK) == 0 || errno != ENOSYS) { wpa_printf(MSG_DEBUG, "random: getrandom() support available"); diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c index b5fff483e..b32e00967 100644 --- a/src/drivers/driver_ndis.c +++ b/src/drivers/driver_ndis.c @@ -1111,20 +1111,20 @@ wpa_driver_ndis_associate(void *priv, auth_mode = Ndis802_11AuthModeOpen; priv_mode = Ndis802_11PrivFilterAcceptAll; if (params->wps == WPS_MODE_PRIVACY) { - u8 dummy_key[5] = { 0x11, 0x22, 0x33, 0x44, 0x55 }; + u8 stub_key[5] = { 0x11, 0x22, 0x33, 0x44, 0x55 }; /* * Some NDIS drivers refuse to associate in open mode * configuration due to Privacy field mismatch, so use * a workaround to make the configuration look like * matching one for WPS provisioning. */ - wpa_printf(MSG_DEBUG, "NDIS: Set dummy WEP key as a " + wpa_printf(MSG_DEBUG, "NDIS: Set stub WEP key as a " "workaround to allow driver to associate " "for WPS"); wpa_driver_ndis_set_key(drv->ifname, drv, WPA_ALG_WEP, bcast, 0, 1, - NULL, 0, dummy_key, - sizeof(dummy_key)); + NULL, 0, stub_key, + sizeof(stub_key)); } #endif /* CONFIG_WPS */ } else { @@ -2233,10 +2233,10 @@ static int wpa_driver_ndis_get_names(struct wpa_driver_ndis_data *drv) /* * Windows 98 with Packet.dll 3.0 alpha3 does not include adapter - * descriptions. Fill in dummy descriptors to work around this. + * descriptions. Fill in stub descriptors to work around this. */ while (num_desc < num_name) - desc[num_desc++] = "dummy description"; + desc[num_desc++] = "stub description"; if (num_name != num_desc) { wpa_printf(MSG_DEBUG, "NDIS: mismatch in adapter name and " @@ -3164,10 +3164,10 @@ wpa_driver_ndis_get_interfaces(void *global_priv) /* * Windows 98 with Packet.dll 3.0 alpha3 does not include adapter - * descriptions. Fill in dummy descriptors to work around this. + * descriptions. Fill in stub descriptors to work around this. */ while (num_desc < num_name) - desc[num_desc++] = "dummy description"; + desc[num_desc++] = "stub description"; if (num_name != num_desc) { wpa_printf(MSG_DEBUG, "NDIS: mismatch in adapter name and " diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 8eb033c78..14118a7d5 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -5144,7 +5144,7 @@ static int wpa_driver_nl80211_sta_add(void *priv, /* * cfg80211 validates that AID is non-zero, so we have * to make this a non-zero value for the TDLS case where - * a dummy STA entry is used for now and for a station + * a stub STA entry is used for now and for a station * that is still not associated. */ wpa_printf(MSG_DEBUG, " * aid=1 (%s workaround)", diff --git a/src/eap_peer/eap_proxy_dummy.c b/src/eap_peer/eap_proxy_dummy.c index 2cc05c92c..181e8cc74 100644 --- a/src/eap_peer/eap_proxy_dummy.c +++ b/src/eap_peer/eap_proxy_dummy.c @@ -1,5 +1,5 @@ /* - * EAP proxy - dummy implementation for build testing + * EAP proxy - stub implementation for build testing * Copyright (c) 2013 Qualcomm Atheros, Inc. * * This software may be distributed under the terms of the BSD license. diff --git a/src/eap_peer/eap_teap.c b/src/eap_peer/eap_teap.c index e8cc7844c..739595b63 100644 --- a/src/eap_peer/eap_teap.c +++ b/src/eap_peer/eap_teap.c @@ -1760,7 +1760,7 @@ static int eap_teap_process_start(struct eap_sm *sm, #ifdef CONFIG_TESTING_OPTIONS -static struct wpabuf * eap_teap_add_dummy_outer_tlvs(struct eap_teap_data *data, +static struct wpabuf * eap_teap_add_stub_outer_tlvs(struct eap_teap_data *data, struct wpabuf *resp) { struct wpabuf *resp2; @@ -1775,11 +1775,11 @@ static struct wpabuf * eap_teap_add_dummy_outer_tlvs(struct eap_teap_data *data, return NULL; } - /* Outer TLVs (dummy Vendor-Specific TLV for testing) */ + /* Outer TLVs (stub Vendor-Specific TLV for testing) */ wpabuf_put_be16(data->peer_outer_tlvs, TEAP_TLV_VENDOR_SPECIFIC); wpabuf_put_be16(data->peer_outer_tlvs, 4); wpabuf_put_be32(data->peer_outer_tlvs, EAP_VENDOR_HOSTAP); - wpa_hexdump_buf(MSG_DEBUG, "EAP-TEAP: TESTING - Add dummy Outer TLVs", + wpa_hexdump_buf(MSG_DEBUG, "EAP-TEAP: TESTING - Add stub Outer TLVs", data->peer_outer_tlvs); wpa_hexdump_buf(MSG_DEBUG, @@ -1986,7 +1986,7 @@ static struct wpabuf * eap_teap_process(struct eap_sm *sm, void *priv, #ifdef CONFIG_TESTING_OPTIONS if (data->test_outer_tlvs && res == 0 && resp && (flags & EAP_TLS_FLAGS_START) && wpabuf_len(resp) >= 6) - resp = eap_teap_add_dummy_outer_tlvs(data, resp); + resp = eap_teap_add_stub_outer_tlvs(data, resp); #endif /* CONFIG_TESTING_OPTIONS */ return resp; diff --git a/src/eap_peer/eap_tls_common.h b/src/eap_peer/eap_tls_common.h index 183b7de00..9ac00121f 100644 --- a/src/eap_peer/eap_tls_common.h +++ b/src/eap_peer/eap_tls_common.h @@ -92,7 +92,7 @@ struct eap_ssl_data { /* could be up to 128 bytes, but only the first 64 bytes are used */ #define EAP_TLS_KEY_LEN 64 -/* dummy type used as a flag for UNAUTH-TLS */ +/* stub type used as a flag for UNAUTH-TLS */ #define EAP_UNAUTH_TLS_TYPE 255 #define EAP_WFA_UNAUTH_TLS_TYPE 254 diff --git a/src/l2_packet/l2_packet_none.c b/src/l2_packet/l2_packet_none.c index bc7a4e82d..6783d7391 100644 --- a/src/l2_packet/l2_packet_none.c +++ b/src/l2_packet/l2_packet_none.c @@ -1,5 +1,5 @@ /* - * WPA Supplicant - Layer2 packet handling example with dummy functions + * WPA Supplicant - Layer2 packet handling example with stub functions * Copyright (c) 2003-2005, Jouni Malinen * * This software may be distributed under the terms of the BSD license. diff --git a/wlantest/inject.c b/wlantest/inject.c index 399f1a3c0..0950a1e9c 100644 --- a/wlantest/inject.c +++ b/wlantest/inject.c @@ -83,17 +83,17 @@ static int wlantest_inject_bip(struct wlantest *wt, struct wlantest_bss *bss, u8 *frame, size_t len, int incorrect_key) { u8 *prot; - u8 dummy[32]; + u8 stub [32]; int ret; size_t plen; if (!bss->igtk_len[bss->igtk_idx]) return -1; - os_memset(dummy, 0x11, sizeof(dummy)); + os_memset(stub, 0x11, sizeof(stub)); inc_byte_array(bss->ipn[bss->igtk_idx], 6); - prot = bip_protect(incorrect_key ? dummy : bss->igtk[bss->igtk_idx], + prot = bip_protect(incorrect_key ? stub : bss->igtk[bss->igtk_idx], bss->igtk_len[bss->igtk_idx], frame, len, bss->ipn[bss->igtk_idx], bss->igtk_idx, &plen); @@ -115,7 +115,7 @@ static int wlantest_inject_prot_bc(struct wlantest *wt, u8 *crypt; size_t crypt_len; int ret; - u8 dummy[64]; + u8 stub[64]; u8 *pn; struct ieee80211_hdr *hdr; u16 fc; @@ -134,14 +134,14 @@ static int wlantest_inject_prot_bc(struct wlantest *wt, pn = bss->rsc[bss->gtk_idx]; inc_byte_array(pn, 6); - os_memset(dummy, 0x11, sizeof(dummy)); + os_memset(stub, 0x11, sizeof(stub)); if (bss->group_cipher == WPA_CIPHER_TKIP) - crypt = tkip_encrypt(incorrect_key ? dummy : + crypt = tkip_encrypt(incorrect_key ? stub : bss->gtk[bss->gtk_idx], frame, len, hdrlen, NULL, pn, bss->gtk_idx, &crypt_len); else - crypt = ccmp_encrypt(incorrect_key ? dummy : + crypt = ccmp_encrypt(incorrect_key ? stub : bss->gtk[bss->gtk_idx], frame, len, hdrlen, NULL, pn, bss->gtk_idx, &crypt_len); @@ -163,7 +163,7 @@ static int wlantest_inject_prot(struct wlantest *wt, struct wlantest_bss *bss, u8 *crypt; size_t crypt_len; int ret; - u8 dummy[64]; + u8 stub[64]; u8 *pn; struct ieee80211_hdr *hdr; u16 fc; @@ -243,17 +243,17 @@ static int wlantest_inject_prot(struct wlantest *wt, struct wlantest_bss *bss, pn = sta->rsc_tods[tid]; inc_byte_array(pn, 6); - os_memset(dummy, 0x11, sizeof(dummy)); + os_memset(stub, 0x11, sizeof(stub)); if (tk) - crypt = ccmp_encrypt(incorrect_key ? dummy : tk, + crypt = ccmp_encrypt(incorrect_key ? stub : tk, frame, len, hdrlen, qos, pn, 0, &crypt_len); else if (sta->pairwise_cipher == WPA_CIPHER_TKIP) - crypt = tkip_encrypt(incorrect_key ? dummy : sta->ptk.tk, + crypt = tkip_encrypt(incorrect_key ? stub : sta->ptk.tk, frame, len, hdrlen, qos, pn, 0, &crypt_len); else - crypt = ccmp_encrypt(incorrect_key ? dummy : sta->ptk.tk, + crypt = ccmp_encrypt(incorrect_key ? stub : sta->ptk.tk, frame, len, hdrlen, qos, pn, 0, &crypt_len); diff --git a/wlantest/rx_eapol.c b/wlantest/rx_eapol.c index d5e10debf..e754f5ff9 100644 --- a/wlantest/rx_eapol.c +++ b/wlantest/rx_eapol.c @@ -703,7 +703,7 @@ static void rx_data_eapol_key_3_of_4(struct wlantest *wt, const u8 *dst, decrypted, decrypted_len); } if ((wt->write_pcap_dumper || wt->pcapng) && decrypted != key_data) { - /* Fill in a dummy Data frame header */ + /* Fill in a stub Data frame header */ u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64]; struct ieee80211_hdr *h; struct wpa_eapol_key *k; @@ -926,7 +926,7 @@ static void rx_data_eapol_key_1_of_2(struct wlantest *wt, const u8 *dst, wpa_hexdump(MSG_DEBUG, "Decrypted EAPOL-Key Key Data", decrypted, decrypted_len); if (wt->write_pcap_dumper || wt->pcapng) { - /* Fill in a dummy Data frame header */ + /* Fill in a stub Data frame header */ u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64]; struct ieee80211_hdr *h; struct wpa_eapol_key *k; From patchwork Thu Jul 1 07:05:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1499397 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=im1MKMT8; 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=PrSgDyOF; 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 4GFq7t15yWz9sVb for ; Thu, 1 Jul 2021 17:08:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FcdqYueUP8LqcnYx4fCMAyw10FzNgv4xaf/bloIWnx4=; b=im1MKMT8JdkT2K dx1UA6mJ73nOtNaRIGgZ2Maj7fWp+Snhq+B2txW1OB3B1fZUaJHfQ1RNSRgtfw8rb4++iJeNR9uTz lckmuHiWvLDZeYzei2p2C1DdamC3PluZfB0jQT8D1p59MRzCHteGLS8IO3mqHJ7g0fWewgN76kFkl oUMhdJKYcj3NEtbBqIkFAJ3sZ8b49IGqFvDFcZBf+AwMr1IfP8buhmuCFap1nezC0aqOKIyhx/jul p/VtuMNgnCZtUyDZvyms0aTCPuo4HQDHufCwvFpGR4Grc1j+NQ2CVSHNZ9EG7QKX5bDiNm8OKFaoM uRRe/qfR24QqnE3HUlVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqmv-00GL5o-OA; Thu, 01 Jul 2021 07:07:05 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyqlf-00GKen-4U for hostap@lists.infradead.org; Thu, 01 Jul 2021 07:05:50 +0000 Received: by mail-pg1-x52a.google.com with SMTP id h4so5244354pgp.5 for ; Thu, 01 Jul 2021 00:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8MR00xbsBOL5omUAIvAkbsB5hdMeXSD0eYwci+cAmr0=; b=PrSgDyOF+VSW5p21z/DEZuk6VmRnQ5ILH0B2x4r+cz+YaLI9B9KJVnIA153WE9sw4E plWBYAOjRgGyzev966WB8DTuIe+Fc1GU+FhBfdDJsm6AdEcosRaW7Dh9/jQBpwKUyfst Y0guYGviX45WHNkl3Ze+nez4iIxSJOLdBVdyc= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8MR00xbsBOL5omUAIvAkbsB5hdMeXSD0eYwci+cAmr0=; b=WKKG6N1ldRQP6P/rfS1zxeCervsQCo5lXSjpA3TKX+6hCIgB9cxeGEOcN0lRLvkoJ5 Nbnr6U1FZyLV5iu5j/TzH92F8qFSiijDKB0qbYIbUO8EuUjyZXVwJwxQeurFg1AlEBD1 V3i18qgHg3XZ0bG0eRTO3sXKY7FtitLTbhe5UHcl2M+7OVxKAX21D/tcyKklwkqwLLqQ J1UKfxYoLtDASmSpBKajhkajQf7YaoBUnHCfQeaXyUKlu+EMiINjaEoK44aH8kDneni9 9c8U+TJETkH1Ld5eBxPtvwcBCsIydcIGDMrHwizcMbyovLpjO3+46xGeHQzX85LcDRrC 5h/Q== X-Gm-Message-State: AOAM531KUXsWI4AEN9A6uSJTk3KfGf7g8kBWsDullROkNkHECMcKhqf/ fyZAwdTFp9Oj+F7PxxPipUasdK9lSoshig== X-Google-Smtp-Source: ABdhPJwBkw8gCjXnLbsFaMGQLFUjFw0wn2ra10CQxEcG0p8VpeJIN+ISqNgVDa78LZNVR+flOE/iPw== X-Received: by 2002:a62:7c4e:0:b029:308:4adf:8d3a with SMTP id x75-20020a627c4e0000b02903084adf8d3amr37931365pfc.4.1625123145755; Thu, 01 Jul 2021 00:05:45 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:9646:c9f5:3197:bfb6]) by smtp.gmail.com with ESMTPSA id y6sm24461663pgk.79.2021.07.01.00.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 00:05:45 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v2 7/7] hostapd: Replace Dummy with Stub Part 2. Date: Thu, 1 Jul 2021 00:05:28 -0700 Message-Id: <20210701070528.2125299-8-arowa@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210701070528.2125299-1-arowa@google.com> References: <20210701070528.2125299-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_000547_304533_F387CC9B X-CRM114-Status: GOOD ( 24.37 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the word dummy with the inclusive word Stub. Signed-off-by: Arowa Suliman --- doc/code_structure.doxygen | 2 +- hostapd/ctrl_iface.c | 10 ++-- hostapd/hlr_auc_gw.milenage_db | 2 +- hostapd/hostapd_cli.c | 2 +- src/eap_server [...] Content analysis details: (-0.4 points, 5.0 required) 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:52a 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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Replaced the word dummy with the inclusive word Stub. Signed-off-by: Arowa Suliman --- doc/code_structure.doxygen | 2 +- hostapd/ctrl_iface.c | 10 ++-- hostapd/hlr_auc_gw.milenage_db | 2 +- hostapd/hostapd_cli.c | 2 +- src/eap_server/eap_tls_common.h | 2 +- src/wps/wps.c | 2 +- src/wps/wps_defs.h | 2 +- src/wps/wps_registrar.c | 26 +++++----- src/wps/wps_upnp.c | 2 +- tests/hwsim/auth_serv/hlr_auc_gw.milenage_db | 2 +- tests/hwsim/multi-bss-iface-per_sta_vif.conf | 4 +- tests/hwsim/multi-bss-iface.conf | 4 +- tests/hwsim/test_ap_vlan.py | 54 ++++++++++---------- tests/hwsim/test_ap_wps.py | 16 +++--- tests/hwsim/test_p2p_autogo.py | 2 +- tests/hwsim/vm/inside.sh | 2 +- tests/hwsim/vm/kernel-config | 2 +- tests/hwsim/vm/kernel-config.uml | 2 +- wpa_supplicant/config_none.c | 2 +- wpa_supplicant/ctrl_iface.c | 10 ++-- wpa_supplicant/preauth_test.c | 6 +-- 21 files changed, 78 insertions(+), 78 deletions(-) diff --git a/doc/code_structure.doxygen b/doc/code_structure.doxygen index ff11506fa..c7ed5c71a 100644 --- a/doc/code_structure.doxygen +++ b/doc/code_structure.doxygen @@ -130,7 +130,7 @@ with with hostapd. The following C files are currently used: Definition of TLS library wrapper \ref tls_none.c - Dummy implementation of TLS library wrapper for cases where TLS + Stub implementation of TLS library wrapper for cases where TLS functionality is not included. \ref tls_openssl.c diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index 4a2d60627..280e94fec 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -1455,10 +1455,10 @@ static int hostapd_ctrl_iface_set(struct hostapd_data *hapd, char *cmd) wps_version_number & 0x0f); hostapd_wps_update_ie(hapd); } - } else if (os_strcasecmp(cmd, "wps_testing_dummy_cred") == 0) { - wps_testing_dummy_cred = atoi(value); - wpa_printf(MSG_DEBUG, "WPS: Testing - dummy_cred=%d", - wps_testing_dummy_cred); + } else if (os_strcasecmp(cmd, "wps_testing_stub_cred") == 0) { + wps_testing_stub_cred = atoi(value); + wpa_printf(MSG_DEBUG, "WPS: Testing - stub_cred=%d", + wps_testing_stub_cred); } else if (os_strcasecmp(cmd, "wps_corrupt_pkhash") == 0) { wps_corrupt_pkhash = atoi(value); wpa_printf(MSG_DEBUG, "WPS: Testing - wps_corrupt_pkhash=%d", @@ -4470,7 +4470,7 @@ static void hostapd_ctrl_iface_flush(struct hapd_interfaces *interfaces) { #ifdef CONFIG_WPS_TESTING wps_version_number = 0x20; - wps_testing_dummy_cred = 0; + wps_testing_stub_cred = 0; wps_corrupt_pkhash = 0; #endif /* CONFIG_WPS_TESTING */ diff --git a/hostapd/hlr_auc_gw.milenage_db b/hostapd/hlr_auc_gw.milenage_db index c156a29ae..a25065310 100644 --- a/hostapd/hlr_auc_gw.milenage_db +++ b/hostapd/hlr_auc_gw.milenage_db @@ -3,7 +3,7 @@ # 4.3.20 Test Set 20. SQN is the last used SQN value. # These values can be used for both UMTS (EAP-AKA) and GSM (EAP-SIM) # authentication. In case of GSM/EAP-SIM, AMF and SQN values are not used, but -# dummy values will need to be included in this file. +# stub values will need to be included in this file. # IMSI Ki OPc AMF SQN [RES_len] 232010000000000 90dca4eda45b53cf0f12d7c9c3bc6a89 cb9cccc4b9258e6dca4760379fb82581 61df 000000000000 diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c index eaa628ad0..0e7fdd6bc 100644 --- a/hostapd/hostapd_cli.c +++ b/hostapd/hostapd_cli.c @@ -1048,7 +1048,7 @@ static char ** hostapd_complete_set(const char *str, int pos) int arg = get_cmd_arg_num(str, pos); const char *fields[] = { #ifdef CONFIG_WPS_TESTING - "wps_version_number", "wps_testing_dummy_cred", + "wps_version_number", "wps_testing_stub_cred", "wps_corrupt_pkhash", #endif /* CONFIG_WPS_TESTING */ #ifdef CONFIG_INTERWORKING diff --git a/src/eap_server/eap_tls_common.h b/src/eap_server/eap_tls_common.h index b0b736123..b0723a1fa 100644 --- a/src/eap_server/eap_tls_common.h +++ b/src/eap_server/eap_tls_common.h @@ -68,7 +68,7 @@ struct eap_ssl_data { /* could be up to 128 bytes, but only the first 64 bytes are used */ #define EAP_TLS_KEY_LEN 64 -/* dummy type used as a flag for UNAUTH-TLS */ +/* stub type used as a flag for UNAUTH-TLS */ #define EAP_UNAUTH_TLS_TYPE 255 #define EAP_WFA_UNAUTH_TLS_TYPE 254 diff --git a/src/wps/wps.c b/src/wps/wps.c index 484df262c..1fe38063b 100644 --- a/src/wps/wps.c +++ b/src/wps/wps.c @@ -17,7 +17,7 @@ #ifdef CONFIG_WPS_TESTING int wps_version_number = 0x20; -int wps_testing_dummy_cred = 0; +int wps_testing_stub_cred = 0; int wps_corrupt_pkhash = 0; int wps_force_auth_types_in_use = 0; u16 wps_force_auth_types = 0; diff --git a/src/wps/wps_defs.h b/src/wps/wps_defs.h index 9fccb4eeb..ddaeda56d 100644 --- a/src/wps/wps_defs.h +++ b/src/wps/wps_defs.h @@ -12,7 +12,7 @@ #ifdef CONFIG_WPS_TESTING extern int wps_version_number; -extern int wps_testing_dummy_cred; +extern int wps_testing_stub_cred; extern int wps_corrupt_pkhash; extern int wps_force_auth_types_in_use; extern u16 wps_force_auth_types; diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c index 173fbbd68..9587293d0 100644 --- a/src/wps/wps_registrar.c +++ b/src/wps/wps_registrar.c @@ -1785,23 +1785,23 @@ int wps_build_cred(struct wps_data *wps, struct wpabuf *msg) use_provided: #ifdef CONFIG_WPS_TESTING - if (wps_testing_dummy_cred) + if (wps_testing_stub_cred) cred = wpabuf_alloc(200); else cred = NULL; if (cred) { - struct wps_credential dummy; - wpa_printf(MSG_DEBUG, "WPS: Add dummy credential"); - os_memset(&dummy, 0, sizeof(dummy)); - os_memcpy(dummy.ssid, "dummy", 5); - dummy.ssid_len = 5; - dummy.auth_type = WPS_AUTH_WPA2PSK; - dummy.encr_type = WPS_ENCR_AES; - os_memcpy(dummy.key, "dummy psk", 9); - dummy.key_len = 9; - os_memcpy(dummy.mac_addr, wps->mac_addr_e, ETH_ALEN); - wps_build_credential(cred, &dummy); - wpa_hexdump_buf(MSG_DEBUG, "WPS: Dummy Credential", cred); + struct wps_credential stub; + wpa_printf(MSG_DEBUG, "WPS: Add stub credential"); + os_memset(&stub, 0, sizeof(stub)); + os_memcpy(stub.ssid, "stub", 5); + stub.ssid_len = 5; + stub.auth_type = WPS_AUTH_WPA2PSK; + stub.encr_type = WPS_ENCR_AES; + os_memcpy(stub.key, "stub psk", 9); + stub.key_len = 9; + os_memcpy(stub.mac_addr, wps->mac_addr_e, ETH_ALEN); + wps_build_credential(cred, &stub); + wpa_hexdump_buf(MSG_DEBUG, "WPS: Stub Credential", cred); wpabuf_put_be16(msg, ATTR_CRED); wpabuf_put_be16(msg, wpabuf_len(cred)); diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c index ff58cb938..05bb9c585 100644 --- a/src/wps/wps_upnp.c +++ b/src/wps/wps_upnp.c @@ -658,7 +658,7 @@ static int subscription_first_event(struct subscription *s) /* * There has been no events before the subscription. However, * UPnP device architecture specification requires all the - * evented variables to be included, so generate a dummy event + * evented variables to be included, so generate a stub event * for this particular case using a WSC_ACK and all-zeros * nonces. The ER (UPnP control point) will ignore this, but at * least it will learn that WLANEvent variable will be used in diff --git a/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db b/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db index 1c494f773..fefe5145f 100644 --- a/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db +++ b/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db @@ -3,7 +3,7 @@ # 4.3.20 Test Set 20. SQN is the last used SQN value. # These values can be used for both UMTS (EAP-AKA) and GSM (EAP-SIM) # authentication. In case of GSM/EAP-SIM, AMF and SQN values are not used, but -# dummy values will need to be included in this file. +# stub values will need to be included in this file. # IMSI Ki OPc AMF SQN 232010000000000 90dca4eda45b53cf0f12d7c9c3bc6a89 cb9cccc4b9258e6dca4760379fb82581 61df 000000000000 diff --git a/tests/hwsim/multi-bss-iface-per_sta_vif.conf b/tests/hwsim/multi-bss-iface-per_sta_vif.conf index f07c13b21..874cb0771 100644 --- a/tests/hwsim/multi-bss-iface-per_sta_vif.conf +++ b/tests/hwsim/multi-bss-iface-per_sta_vif.conf @@ -9,7 +9,7 @@ ctrl_interface=/var/run/hostapd ssid=bss-1 dynamic_vlan=1 -vlan_tagged_interface=dummy0 +vlan_tagged_interface=stub0 vlan_bridge=brvlan wpa=2 wpa_key_mgmt=WPA-EAP @@ -28,7 +28,7 @@ ctrl_interface=/var/run/hostapd ssid=bss-2 dynamic_vlan=1 -vlan_tagged_interface=dummy0 +vlan_tagged_interface=stub0 vlan_bridge=brvlan wpa=2 wpa_key_mgmt=WPA-EAP diff --git a/tests/hwsim/multi-bss-iface.conf b/tests/hwsim/multi-bss-iface.conf index 6b6167f51..5370352c9 100644 --- a/tests/hwsim/multi-bss-iface.conf +++ b/tests/hwsim/multi-bss-iface.conf @@ -9,7 +9,7 @@ ctrl_interface=/var/run/hostapd ssid=bss-1 dynamic_vlan=1 -vlan_tagged_interface=dummy0 +vlan_tagged_interface=stub0 vlan_bridge=brvlan wpa=2 wpa_key_mgmt=WPA-EAP @@ -27,7 +27,7 @@ ctrl_interface=/var/run/hostapd ssid=bss-2 dynamic_vlan=1 -vlan_tagged_interface=dummy0 +vlan_tagged_interface=stub0 vlan_bridge=brvlan wpa=2 wpa_key_mgmt=WPA-EAP diff --git a/tests/hwsim/test_ap_vlan.py b/tests/hwsim/test_ap_vlan.py index 29f8f5322..ef0e9fd7f 100644 --- a/tests/hwsim/test_ap_vlan.py +++ b/tests/hwsim/test_ap_vlan.py @@ -378,41 +378,41 @@ def test_ap_vlan_tagged(dev, apdev): os.unlink(filename) def ap_vlan_iface_cleanup_multibss_cleanup(): - subprocess.call(['ifconfig', 'dummy0', 'down'], + subprocess.call(['ifconfig', 'stub0', 'down'], stderr=open('/dev/null', 'w')) - ifnames = ['wlan3.1', 'wlan3.2', 'wlan3-2.1', 'wlan3-2.2', 'dummy0.2', - 'dummy0.1', 'dummy0', 'brvlan1', 'brvlan2'] + ifnames = ['wlan3.1', 'wlan3.2', 'wlan3-2.1', 'wlan3-2.2', 'stub0.2', + 'stub0.1', 'stub0', 'brvlan1', 'brvlan2'] for ifname in ifnames: subprocess.call(['ip', 'link', 'del', ifname], stderr=open('/dev/null', 'w')) def ap_vlan_iface_test_and_prepare_environ(): ifaces = netifaces.interfaces() - if "dummy0" in ifaces: - raise Exception("dummy0 already exists before") + if "stub0" in ifaces: + raise Exception("stub0 already exists before") ifaces = netifaces.interfaces() - if "dummy0.1" in ifaces: - raise Exception("dummy0.1 already exists before") + if "stub0.1" in ifaces: + raise Exception("stub0.1 already exists before") - subprocess.call(['ip', 'link', 'add', 'dummy0', 'type', 'dummy']) - subprocess.call(['ifconfig', 'dummy0', 'up']) + subprocess.call(['ip', 'link', 'add', 'stub0', 'type', 'stub']) + subprocess.call(['ifconfig', 'stub0', 'up']) ifaces = netifaces.interfaces() - if "dummy0" not in ifaces: - raise HwsimSkip("failed to add dummy0 - missing kernel config DUMMY ?") + if "stub0" not in ifaces: + raise HwsimSkip("failed to add stub0 - missing kernel config DUMMY ?") - subprocess.call(['ip', 'link', 'add', 'link', 'dummy0', 'name', 'dummy0.1', + subprocess.call(['ip', 'link', 'add', 'link', 'stub0', 'name', 'stub0.1', 'type', 'vlan', 'id', '1']) ifaces = netifaces.interfaces() - if "dummy0.1" not in ifaces: - raise HwsimSkip("failed to add dummy0.1 - missing kernel config VLAN_8021Q ?") + if "stub0.1" not in ifaces: + raise HwsimSkip("failed to add stub0.1 - missing kernel config VLAN_8021Q ?") - subprocess.call(['ip', 'link', 'del', 'dummy0.1']) + subprocess.call(['ip', 'link', 'del', 'stub0.1']) ifaces = netifaces.interfaces() - if "dummy0.1" in ifaces: - raise Exception("dummy0.1 was not removed before testing") + if "stub0.1" in ifaces: + raise Exception("stub0.1 was not removed before testing") def test_ap_vlan_iface_cleanup_multibss(dev, apdev): """AP VLAN operation in multi-BSS multi-VLAN case""" @@ -464,8 +464,8 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile): raise Exception("bridge brvlan1 was not created") hwsim_utils.test_connectivity_iface(dev[0], hapd, "brvlan1") - if not iface_is_in_bridge("brvlan1", "dummy0.1"): - raise Exception("dummy0.1 not in brvlan1") + if not iface_is_in_bridge("brvlan1", "stub0.1"): + raise Exception("stub0.1 not in brvlan1") dev[1].connect("bss-2", key_mgmt="WPA-EAP", eap="PAX", identity="vlan1", @@ -474,8 +474,8 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile): hapd1.wait_sta() hwsim_utils.test_connectivity_iface(dev[1], hapd1, "brvlan1") - if not iface_is_in_bridge("brvlan1", "dummy0.1"): - raise Exception("dummy0.1 not in brvlan1") + if not iface_is_in_bridge("brvlan1", "stub0.1"): + raise Exception("stub0.1 not in brvlan1") authserv.disable() authserv.set('eap_user_file', "auth_serv/eap_user_vlan.conf") @@ -502,13 +502,13 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile): hwsim_utils.test_connectivity_iface(dev[0], hapd, "brvlan2", max_tries=5) - if not iface_is_in_bridge("brvlan2", "dummy0.2"): - raise Exception("dummy0.2 not in brvlan2") + if not iface_is_in_bridge("brvlan2", "stub0.2"): + raise Exception("stub0.2 not in brvlan2") logger.info("test wlan1 == VLAN 1") hwsim_utils.test_connectivity_iface(dev[1], hapd1, "brvlan1") - if not iface_is_in_bridge("brvlan1", "dummy0.1"): - raise Exception("dummy0.1 not in brvlan1") + if not iface_is_in_bridge("brvlan1", "stub0.1"): + raise Exception("stub0.1 not in brvlan1") logger.info("wlan1 -> VLAN 2") @@ -530,8 +530,8 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile): logger.info("test wlan0 == VLAN 2") hwsim_utils.test_connectivity_iface(dev[0], hapd, "brvlan2") - if not iface_is_in_bridge("brvlan2", "dummy0.2"): - raise Exception("dummy0.2 not in brvlan2") + if not iface_is_in_bridge("brvlan2", "stub0.2"): + raise Exception("stub0.2 not in brvlan2") ifaces = netifaces.interfaces() if "brvlan1" in ifaces: diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index a07ed60b8..d784af8df 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -5066,14 +5066,14 @@ def _test_ap_wps_http_timeout(dev, apdev): sock.connect(addr) sock.send(b"G") - class DummyServer(StreamRequestHandler): + class StubServer(StreamRequestHandler): def handle(self): - logger.debug("DummyServer - start 31 sec wait") + logger.debug("StubServer - start 31 sec wait") time.sleep(31) - logger.debug("DummyServer - wait done") + logger.debug("StubServer - wait done") logger.debug("Start WPS ER") - server, sock2 = wps_er_start(dev[0], DummyServer, max_age=40, + server, sock2 = wps_er_start(dev[0], StubServer, max_age=40, wait_m_search=True) logger.debug("Start server to accept, but not complete, HTTP connection from WPS ER") @@ -10131,8 +10131,8 @@ def test_ap_wps_tkip(dev, apdev): if "FAIL" not in hapd.request("WPS_PBC"): raise Exception("WPS unexpectedly enabled") -def test_ap_wps_conf_dummy_cred(dev, apdev): - """WPS PIN provisioning with configured AP using dummy cred""" +def test_ap_wps_conf_stub_cred(dev, apdev): + """WPS PIN provisioning with configured AP using stub cred""" ssid = "test-wps-conf" hapd = hostapd.add_ap(apdev[0], {"ssid": ssid, "eap_server": "1", "wps_state": "2", @@ -10142,7 +10142,7 @@ def test_ap_wps_conf_dummy_cred(dev, apdev): dev[0].scan_for_bss(apdev[0]['bssid'], freq="2412") dev[0].dump_monitor() try: - hapd.set("wps_testing_dummy_cred", "1") + hapd.set("wps_testing_stub_cred", "1") dev[0].request("WPS_PIN " + apdev[0]['bssid'] + " 12345670") for i in range(1, 3): ev = dev[0].wait_event(["WPS-CRED-RECEIVED"], timeout=15) @@ -10150,7 +10150,7 @@ def test_ap_wps_conf_dummy_cred(dev, apdev): raise Exception("WPS credential %d not received" % i) dev[0].wait_connected(timeout=30) finally: - hapd.set("wps_testing_dummy_cred", "0") + hapd.set("wps_testing_stub_cred", "0") def test_ap_wps_rf_bands(dev, apdev): """WPS and wps_rf_bands configuration""" diff --git a/tests/hwsim/test_p2p_autogo.py b/tests/hwsim/test_p2p_autogo.py index 91d68eaf2..d857c9025 100644 --- a/tests/hwsim/test_p2p_autogo.py +++ b/tests/hwsim/test_p2p_autogo.py @@ -378,7 +378,7 @@ def test_autogo_chan_switch_group_iface(dev): @remote_compatible def test_autogo_extra_cred(dev): """P2P autonomous GO sending two WPS credentials""" - if "FAIL" in dev[0].request("SET wps_testing_dummy_cred 1"): + if "FAIL" in dev[0].request("SET wps_testing_stub_cred 1"): raise Exception("Failed to enable test mode") autogo(dev[0], freq=2412) connect_cli(dev[0], dev[1], social=True, freq=2412) diff --git a/tests/hwsim/vm/inside.sh b/tests/hwsim/vm/inside.sh index 9d4a933fe..8ba7ce43d 100755 --- a/tests/hwsim/vm/inside.sh +++ b/tests/hwsim/vm/inside.sh @@ -53,7 +53,7 @@ ln -s /proc/self/fd/2 /dev/stderr echo "VM has started up" > /dev/ttyS0 -# create dummy sudo - everything runs as uid 0 +# create stub sudo - everything runs as uid 0 mkdir /tmp/bin cat > /tmp/bin/sudo << EOF #!/bin/bash diff --git a/tests/hwsim/vm/kernel-config b/tests/hwsim/vm/kernel-config index 2aff20af4..ec3d3a8aa 100644 --- a/tests/hwsim/vm/kernel-config +++ b/tests/hwsim/vm/kernel-config @@ -98,7 +98,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_PNP_DEBUG_MESSAGES is not set # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y -CONFIG_DUMMY=y +CONFIG_STUB=y CONFIG_MACSEC=y CONFIG_VETH=y # CONFIG_ETHERNET is not set diff --git a/tests/hwsim/vm/kernel-config.uml b/tests/hwsim/vm/kernel-config.uml index b0f2f65ac..f6de9c4d4 100644 --- a/tests/hwsim/vm/kernel-config.uml +++ b/tests/hwsim/vm/kernel-config.uml @@ -84,7 +84,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_LOOP=y -CONFIG_DUMMY=y +CONFIG_STUB=y CONFIG_MACSEC=y CONFIG_VETH=y # CONFIG_ETHERNET is not set diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c index 2aac28fa3..0bc977e39 100644 --- a/wpa_supplicant/config_none.c +++ b/wpa_supplicant/config_none.c @@ -5,7 +5,7 @@ * This software may be distributed under the terms of the BSD license. * See README for more details. * - * This file implements dummy example of a configuration backend. None of the + * This file implements stub example of a configuration backend. None of the * functions are actually implemented so this can be used as a simple * compilation test or a starting point for a new configuration backend. */ diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 2b3243e5a..f4a6c0afd 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -568,10 +568,10 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s, (wps_version_number & 0xf0) >> 4, wps_version_number & 0x0f); } - } else if (os_strcasecmp(cmd, "wps_testing_dummy_cred") == 0) { - wps_testing_dummy_cred = atoi(value); - wpa_printf(MSG_DEBUG, "WPS: Testing - dummy_cred=%d", - wps_testing_dummy_cred); + } else if (os_strcasecmp(cmd, "wps_testing_stub_cred") == 0) { + wps_testing_stub_cred = atoi(value); + wpa_printf(MSG_DEBUG, "WPS: Testing - stub_cred=%d", + wps_testing_stub_cred); } else if (os_strcasecmp(cmd, "wps_corrupt_pkhash") == 0) { wps_corrupt_pkhash = atoi(value); wpa_printf(MSG_DEBUG, "WPS: Testing - wps_corrupt_pkhash=%d", @@ -8428,7 +8428,7 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s) #ifdef CONFIG_WPS_TESTING wps_version_number = 0x20; - wps_testing_dummy_cred = 0; + wps_testing_stub_cred = 0; wps_corrupt_pkhash = 0; wps_force_auth_types_in_use = 0; wps_force_encr_types_in_use = 0; diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c index 97c16fb80..31b55325f 100644 --- a/wpa_supplicant/preauth_test.c +++ b/wpa_supplicant/preauth_test.c @@ -220,7 +220,7 @@ static void eapol_test_poll(void *eloop_ctx, void *timeout_ctx) } -static struct wpa_driver_ops dummy_driver; +static struct wpa_driver_ops stub_driver; static void wpa_init_conf(struct wpa_supplicant *wpa_s, const char *ifname) @@ -228,8 +228,8 @@ static void wpa_init_conf(struct wpa_supplicant *wpa_s, const char *ifname) struct l2_packet_data *l2; struct wpa_sm_ctx *ctx; - os_memset(&dummy_driver, 0, sizeof(dummy_driver)); - wpa_s->driver = &dummy_driver; + os_memset(&stub_driver, 0, sizeof(stub_driver)); + wpa_s->driver = &stub_driver; ctx = os_zalloc(sizeof(*ctx)); assert(ctx != NULL);