From patchwork Tue Sep 14 03:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1529745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Thzd5D7j; 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=kTI30agU; dkim-atps=neutral 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=) 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 4HBl0w5R2dz9sW5 for ; Sun, 19 Sep 2021 07:52:32 +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=i/eNqwD4wE87l8Hd2n3fxc3Vny7Cl2b/5rrsTs9AoPg=; b=Thzd5D7j2y0ycE 1VBgu+ye4Fos1YNI/UgvP+QUWz1IJOpSa1lGlS5q1J0OkswXU9S/jiqiD3rU2U3kXqt4cwCgG91X5 jhe8nGeSQo3XXoUpTyn2/riQ5bSnBMiQJeVJbmjhPurhBpL4EQTZnCuhl7cHFFsxYBJyL8/MT5067 j2++UxT9f0Mt5UlGCoSP3alHXeM/SHT6qE1CbIRgB+4yLT828p8HdU9Gs30Xm7WweXisSY1MeruMq NVNubaULrYXPbKSvrxpiL+b98LODPRec8nUda6JlbEnAA17pZNzcPtX0wfDeNGEAYKgu607KU63Yl Tqvfvnev2SHtksFG6Z3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mRiEx-00GOUk-Ja; Sat, 18 Sep 2021 21:51:19 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPzNP-004422-7Z for hostap@lists.infradead.org; Tue, 14 Sep 2021 03:45:00 +0000 Received: by mail-pj1-x102b.google.com with SMTP id j1so7889788pjv.3 for ; Mon, 13 Sep 2021 20:44:54 -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=4CJnx1A9vHJnNtcEtgBSo/WjMT2MCg9lsg9gZuSnua0=; b=kTI30agU69iNo64miWLrZtt84QgTq4izVDFSjgV1rL+FmXN688S04Gh7SLHncNUae+ 4rkyIwsrVXwGkm5wJMgeq8zW4/WfD9aDD9DcwGULk08pU+I51g+S9wsz+9A6pvhUA1Zi wn1x8zyZoCnDabTdHNJtc+c9VdT6MYes1m+e8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4CJnx1A9vHJnNtcEtgBSo/WjMT2MCg9lsg9gZuSnua0=; b=GyL89UNk/sYnuj4MyTCnT7rAb1eIj45+hBlphM5dMfsVk2i3SRB+HCDwESCpkUtDtt KOdc8lQrpPTDIaLf9fSuFartvPdKsqRkW8o7kH4dPBnh+7+LtdiKBOLo/Q85lvZ6rDhf jl5vtxjvX1D8njT1+j3Ps7iV7dWLUF4OGVeoTCi6Sf1KJkaVqkpIWxnkqUel6dTY/vwf gSrYI2Zup9gxIYu5ApYkOC5Cr32JOBzdffv9jmTkMaHtfDhjx3KXWS2BCVud9gJtL7A5 V7jLM1dsoQMp9/EaJDsAe8MRXePtFkEnpJqrY7YLzdf8eLQufP/R1IqxXqnURTEGN6uR GARA== X-Gm-Message-State: AOAM533qRjufNAvnXVH8tsTcY8xZXamTueNxsfpIectVhiEr1VVPPcqL 8t1Kzjvi3B6xaXQd0eME7exAXOnPMnzBGQ== X-Google-Smtp-Source: ABdhPJx2MGE+xumM96XpKrWybMmL/Abrs+3inZypN8l8yNDJE0pMCHAw/5MJBAcrLi0teFTLUW+ffA== X-Received: by 2002:a17:90a:bb09:: with SMTP id u9mr3138527pjr.165.1631591092107; Mon, 13 Sep 2021 20:44:52 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:5e0f:9937:4048:1740]) by smtp.gmail.com with ESMTPSA id l185sm8530509pfd.62.2021.09.13.20.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 20:44:51 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman , Arowa Suliman Subject: [PATCH v5 3/7] doc: src: Replace Master. Date: Mon, 13 Sep 2021 20:44:32 -0700 Message-Id: <20210914034436.1411008-3-arowa@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog In-Reply-To: <20210914034436.1411008-1-arowa@google.com> References: <20210914034436.1411008-1-arowa@google.com> MIME-Version: 1.0 X-Spam-Note: CRM114 run bypassed due to message size (111816 bytes) 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 Master with inclusive terms such as Main, Leader and Owner. Signed-off-by: Arowa Suliman --- src/drivers/driver_hostap.h | 2 - ...icant-hostapd-Replace-MITM-with-PITM.patch | 43 + ...pplicant-src-Replace-Sane-with-Valid.patch | 75 + ..._su [...] 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:102b 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-Mailman-Approved-At: Sat, 18 Sep 2021 14:51:19 -0700 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 Master with inclusive terms such as Main, Leader and Owner. Signed-off-by: Arowa Suliman --- src/drivers/driver_hostap.h | 2 - ...icant-hostapd-Replace-MITM-with-PITM.patch | 43 + ...pplicant-src-Replace-Sane-with-Valid.patch | 75 + ..._supplicant-src-tests-Replace-Sanity.patch | 182 +++ v4-0004-doc-src-Replace-Master.patch | 76 + ...ntest-Replace-Dummy-with-Stub-Part-1.patch | 577 +++++++ ...stapd-Replace-Dummy-with-Stub-Part-2.patch | 535 +++++++ ...supplicant-doc-Replace-Native-Part-1.patch | 86 ++ ...nt-hostapd-src-Replace-Native-Part-2.patch | 1365 +++++++++++++++++ 9 files changed, 2939 insertions(+), 2 deletions(-) create mode 100644 v4-0001-wpa_supplicant-hostapd-Replace-MITM-with-PITM.patch create mode 100644 v4-0002-wpa_supplicant-src-Replace-Sane-with-Valid.patch create mode 100644 v4-0003-wpa_supplicant-src-tests-Replace-Sanity.patch create mode 100644 v4-0004-doc-src-Replace-Master.patch create mode 100644 v4-0005-src-wlantest-Replace-Dummy-with-Stub-Part-1.patch create mode 100644 v4-0006-hostapd-Replace-Dummy-with-Stub-Part-2.patch create mode 100644 v4-0007-wpa_supplicant-doc-Replace-Native-Part-1.patch create mode 100644 v4-0008-wpa_supplicant-hostapd-src-Replace-Native-Part-2.patch diff --git a/src/drivers/driver_hostap.h b/src/drivers/driver_hostap.h index 4c1e6d69f..ac0b83ad2 100644 --- a/src/drivers/driver_hostap.h +++ b/src/drivers/driver_hostap.h @@ -55,8 +55,6 @@ 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_HOST_ROAMING = 21, PRISM2_PARAM_BCRX_STA_KEY = 22, PRISM2_PARAM_IEEE_802_1X = 23, diff --git a/v4-0001-wpa_supplicant-hostapd-Replace-MITM-with-PITM.patch b/v4-0001-wpa_supplicant-hostapd-Replace-MITM-with-PITM.patch new file mode 100644 index 000000000..da141a6e5 --- /dev/null +++ b/v4-0001-wpa_supplicant-hostapd-Replace-MITM-with-PITM.patch @@ -0,0 +1,43 @@ +From 53050060be90a075a1424f9eeaeeccc6f7ff42c1 Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Tue, 22 Jun 2021 16:16:53 -0700 +Subject: [PATCH v4 1/8] wpa_supplicant: hostapd: Replace MITM with PITM. + +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 +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0002-wpa_supplicant-src-Replace-Sane-with-Valid.patch b/v4-0002-wpa_supplicant-src-Replace-Sane-with-Valid.patch new file mode 100644 index 000000000..eb7630585 --- /dev/null +++ b/v4-0002-wpa_supplicant-src-Replace-Sane-with-Valid.patch @@ -0,0 +1,75 @@ +From e61d38ec2d75b5f8d5a0c1fa0d0c6b06a647509e Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Tue, 22 Jun 2021 16:21:36 -0700 +Subject: [PATCH v4 2/8] wpa_supplicant: src: Replace Sane with Valid. + +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 +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0003-wpa_supplicant-src-tests-Replace-Sanity.patch b/v4-0003-wpa_supplicant-src-tests-Replace-Sanity.patch new file mode 100644 index 000000000..df3466ee9 --- /dev/null +++ b/v4-0003-wpa_supplicant-src-tests-Replace-Sanity.patch @@ -0,0 +1,182 @@ +From 5919c0ffbab171507b59e0a75e25ba5358554f69 Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Tue, 22 Jun 2021 16:22:34 -0700 +Subject: [PATCH v4 3/8] wpa_supplicant: src: tests: Replace Sanity. + +Replaced the word Sanity with the inclusive word Validity. + +Signed-off-by: Arowa Suliman +--- + src/ap/acs.c | 2 -- + 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 +- + tests/remote/run-tests.py | 6 +++--- + wpa_supplicant/ctrl_iface.c | 2 +- + wpa_supplicant/p2p_supplicant_sd.c | 4 ++-- + 9 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/src/ap/acs.c b/src/ap/acs.c +index a11204536..593a6b8d2 100644 +--- a/src/ap/acs.c ++++ b/src/ap/acs.c +@@ -309,8 +309,6 @@ acs_survey_interference_factor(struct freq_survey *survey, s8 min_nf) + else if (survey->filled & SURVEY_HAS_CHAN_TIME_RX) + busy = survey->channel_time_rx; + else { +- /* This shouldn't really happen as survey data is checked in +- * acs_sanity_check() */ + wpa_printf(MSG_ERROR, "ACS: Survey data missing"); + return 0; + } +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/tests/remote/run-tests.py b/tests/remote/run-tests.py +index 67993a3c2..bae4262a0 100755 +--- a/tests/remote/run-tests.py ++++ b/tests/remote/run-tests.py +@@ -33,7 +33,7 @@ from hwsim_wrapper import run_hwsim_test + def usage(): + print("USAGE: " + sys.argv[0] + " -t devices") + print("USAGE: " + sys.argv[0] + " -t check_devices") +- print("USAGE: " + sys.argv[0] + " -d -t [-r ] [-c ] [-m ] [-h hwsim_tests] [-f hwsim_modules][-R][-T][-P][-S][-v]") ++ print("USAGE: " + sys.argv[0] + " -d -t [-r ] [-c ] [-m ] [-h hwsim_tests] [-f hwsim_modules][-R][-T][-P][-S][-v]") + print("USAGE: " + sys.argv[0]) + + def get_devices(devices, duts, refs, monitors): +@@ -270,9 +270,9 @@ def main(): + tests_to_run = tests + if requested_tests[0] == "help": + pass +- elif requested_tests[0] == "sanity": ++ elif requested_tests[0] == "validity": + for test in tests: +- if test.__name__.startswith("test_sanity_"): ++ if test.__name__.startswith("test_validity_"): + tests_to_run.append(test) + else: + for test in requested_tests: +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; + +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0004-doc-src-Replace-Master.patch b/v4-0004-doc-src-Replace-Master.patch new file mode 100644 index 000000000..86b446884 --- /dev/null +++ b/v4-0004-doc-src-Replace-Master.patch @@ -0,0 +1,76 @@ +From e317c21ea07a5a23fd2730b8482ceb89d2e143b6 Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Tue, 22 Jun 2021 16:32:57 -0700 +Subject: [PATCH v4 4/8] doc: src: Replace Master. + +Replaced the word Master with inclusive terms such as Main, Leader and +Owner. + +Signed-off-by: Arowa Suliman +--- + doc/doxygen.conf | 2 +- + src/drivers/driver_hostap.h | 4 ++-- + src/p2p/p2p.h | 2 +- + src/utils/pcsc_funcs.c | 4 ++-- + 4 files changed, 6 insertions(+), 6 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/drivers/driver_hostap.h b/src/drivers/driver_hostap.h +index 4c1e6d69f..2daf7380b 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_OWNER_THRESHOLD_RX = 19, ++ PRISM2_PARAM_BUS_OWNER_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..7cd2a1ae5 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). ++ * leader 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 +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0005-src-wlantest-Replace-Dummy-with-Stub-Part-1.patch b/v4-0005-src-wlantest-Replace-Dummy-with-Stub-Part-1.patch new file mode 100644 index 000000000..8bffb5cf7 --- /dev/null +++ b/v4-0005-src-wlantest-Replace-Dummy-with-Stub-Part-1.patch @@ -0,0 +1,577 @@ +From 8ba442fbc4fb8abea61a0a130e84965564cd439e Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Wed, 30 Jun 2021 22:26:13 -0700 +Subject: [PATCH v4 5/8] src: wlantest: Replace Dummy with Stub Part 1. + +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/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 +-- + 13 files changed, 73 insertions(+), 73 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/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; +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0006-hostapd-Replace-Dummy-with-Stub-Part-2.patch b/v4-0006-hostapd-Replace-Dummy-with-Stub-Part-2.patch new file mode 100644 index 000000000..e7ea4e7c3 --- /dev/null +++ b/v4-0006-hostapd-Replace-Dummy-with-Stub-Part-2.patch @@ -0,0 +1,535 @@ +From f474557bdf29701ebb62dbc96a8f8bfd1201709e Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Wed, 30 Jun 2021 22:28:18 -0700 +Subject: [PATCH v4 6/8] hostapd: Replace Dummy with Stub Part 2. + +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 454f17975..3a3b21b72 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); +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0007-wpa_supplicant-doc-Replace-Native-Part-1.patch b/v4-0007-wpa_supplicant-doc-Replace-Native-Part-1.patch new file mode 100644 index 000000000..507dd43d4 --- /dev/null +++ b/v4-0007-wpa_supplicant-doc-Replace-Native-Part-1.patch @@ -0,0 +1,86 @@ +From 25ef52d71b181a49feee8e9b62198984640b0877 Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Tue, 22 Jun 2021 16:19:41 -0700 +Subject: [PATCH v4 7/8] wpa_supplicant: doc: Replace Native Part 1. + +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 3a3b21b72..c7ed5c71a 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 +-- +2.32.0.402.g57bb445576-goog + diff --git a/v4-0008-wpa_supplicant-hostapd-src-Replace-Native-Part-2.patch b/v4-0008-wpa_supplicant-hostapd-src-Replace-Native-Part-2.patch new file mode 100644 index 000000000..423cdc3a8 --- /dev/null +++ b/v4-0008-wpa_supplicant-hostapd-src-Replace-Native-Part-2.patch @@ -0,0 +1,1365 @@ +From 57da2342ffbf5122d1673189db2a0779bfaeee7d Mon Sep 17 00:00:00 2001 +From: Arowa Suliman +Date: Wed, 7 Jul 2021 23:18:26 -0700 +Subject: [PATCH v4 8/8] wpa_supplicant: hostapd: src: Replace Native Part 2. + +Replace CONFIG_NATIVE_WINDOWS with CONFIG_WINDOWS. + +Signed-off-by: Arowa Suliman +--- + hostapd/Android.mk | 6 ++--- + hostapd/Makefile | 6 ++--- + hostapd/config_file.c | 8 +++--- + hostapd/ctrl_iface.c | 4 +-- + hostapd/main.c | 28 ++++++++++----------- + src/ap/ap_config.h | 4 +-- + src/ap/beacon.c | 4 +-- + src/ap/hostapd.h | 4 +-- + src/ap/ieee802_11.c | 4 +-- + src/crypto/tls_openssl.c | 24 +++++++++--------- + src/drivers/driver_ndis.c | 6 ++--- + src/eap_peer/tncc.c | 28 ++++++++++----------- + src/l2_packet/l2_packet_pcap.c | 4 +-- + src/radius/radius_client.c | 8 +++--- + src/utils/build_config.h | 2 +- + src/utils/common.c | 4 +-- + src/utils/common.h | 14 +++++------ + src/utils/eloop.c | 18 ++++++------- + src/utils/includes.h | 4 +-- + src/utils/ip_addr.c | 4 +-- + src/utils/os_win32.c | 8 +++--- + src/utils/pcsc_funcs.c | 6 ++--- + wpa_supplicant/Android.mk | 14 +++++------ + wpa_supplicant/ChangeLog | 4 +-- + wpa_supplicant/Makefile | 14 +++++------ + wpa_supplicant/README-Windows.txt | 2 +- + wpa_supplicant/android.config | 4 +-- + wpa_supplicant/ctrl_iface.c | 2 +- + wpa_supplicant/defconfig | 4 +-- + wpa_supplicant/eapol_test.c | 6 ++--- + wpa_supplicant/nmake.mak | 2 +- + wpa_supplicant/rrm.c | 2 +- + wpa_supplicant/wpa_gui-qt4/addinterface.cpp | 12 ++++----- + wpa_supplicant/wpa_gui-qt4/main.cpp | 12 ++++----- + wpa_supplicant/wpa_gui-qt4/wpa_gui.pro | 6 ++--- + wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 20 +++++++-------- + wpa_supplicant/wpa_gui-qt4/wpagui.h | 8 +++--- + 37 files changed, 155 insertions(+), 155 deletions(-) + +diff --git a/hostapd/Android.mk b/hostapd/Android.mk +index dd8aa2450..5190ed422 100644 +--- a/hostapd/Android.mk ++++ b/hostapd/Android.mk +@@ -64,7 +64,7 @@ endif + + + ifndef CONFIG_OS +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_OS=win32 + else + CONFIG_OS=unix +@@ -75,8 +75,8 @@ ifeq ($(CONFIG_OS), internal) + L_CFLAGS += -DOS_NO_C_LIB_DEFINES + endif + +-ifdef CONFIG_NATIVE_WINDOWS +-L_CFLAGS += -DCONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS ++L_CFLAGS += -DCONFIG_WINDOWS + LIBS += -lws2_32 + endif + +diff --git a/hostapd/Makefile b/hostapd/Makefile +index ac085fd10..e8c9f518d 100644 +--- a/hostapd/Makefile ++++ b/hostapd/Makefile +@@ -43,7 +43,7 @@ CONFIG_WPS_TESTING=y + endif + + ifndef CONFIG_OS +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_OS=win32 + else + CONFIG_OS=unix +@@ -54,8 +54,8 @@ ifeq ($(CONFIG_OS), internal) + CFLAGS += -DOS_NO_C_LIB_DEFINES + endif + +-ifdef CONFIG_NATIVE_WINDOWS +-CFLAGS += -DCONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS ++CFLAGS += -DCONFIG_WINDOWS + LIBS += -lws2_32 + endif + +diff --git a/hostapd/config_file.c b/hostapd/config_file.c +index 9bc1dc775..af87d640f 100644 +--- a/hostapd/config_file.c ++++ b/hostapd/config_file.c +@@ -7,9 +7,9 @@ + */ + + #include "utils/includes.h" +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #include "utils/common.h" + #include "utils/uuid.h" +@@ -3079,7 +3079,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, + os_free(bss->ctrl_interface); + bss->ctrl_interface = os_strdup(pos); + } else if (os_strcmp(buf, "ctrl_interface_group") == 0) { +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + struct group *grp; + char *endp; + const char *group = pos; +@@ -3103,7 +3103,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, + bss->ctrl_interface_gid_set = 1; + wpa_printf(MSG_DEBUG, "ctrl_interface_group=%d", + bss->ctrl_interface_gid); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + #endif /* CONFIG_NO_CTRL_IFACE */ + #ifdef RADIUS_SERVER + } else if (os_strcmp(buf, "radius_server_clients") == 0) { +diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c +index 280e94fec..0e157f953 100644 +--- a/hostapd/ctrl_iface.c ++++ b/hostapd/ctrl_iface.c +@@ -8,7 +8,7 @@ + + #include "utils/includes.h" + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + + #ifdef CONFIG_TESTING_OPTIONS + #ifdef __NetBSD__ +@@ -5262,4 +5262,4 @@ static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level, + } + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ +diff --git a/hostapd/main.c b/hostapd/main.c +index 4f2d1f216..14c47bd6c 100644 +--- a/hostapd/main.c ++++ b/hostapd/main.c +@@ -7,10 +7,10 @@ + */ + + #include "utils/includes.h" +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + #include + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #include "utils/common.h" + #include "utils/eloop.h" +@@ -116,7 +116,7 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module, + wpa_printf(MSG_INFO, "%s", format); + } + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + if ((conf_syslog & module) && level >= conf_syslog_level) { + int priority; + switch (level) { +@@ -139,7 +139,7 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module, + } + syslog(priority, "%s", format); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + os_free(format); + } +@@ -300,7 +300,7 @@ static void handle_term(int sig, void *signal_ctx) + } + + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + + static int handle_reload_iface(struct hostapd_iface *iface, void *ctx) + { +@@ -328,7 +328,7 @@ static void handle_dump_state(int sig, void *signal_ctx) + { + /* Not used anymore - ignore signal */ + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + static int hostapd_global_init(struct hapd_interfaces *interfaces, +@@ -353,15 +353,15 @@ static int hostapd_global_init(struct hapd_interfaces *interfaces, + + random_init(entropy_file); + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + eloop_register_signal(SIGHUP, handle_reload, interfaces); + eloop_register_signal(SIGUSR1, handle_dump_state, interfaces); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + eloop_register_signal_terminate(handle_term, interfaces); + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + openlog("hostapd", 0, LOG_DAEMON); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + for (i = 0; wpa_drivers[i]; i++) + global.drv_count++; +@@ -398,9 +398,9 @@ static void hostapd_global_deinit(const char *pid_file, int eloop_initialized) + if (eloop_initialized) + eloop_destroy(); + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + closelog(); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + eap_server_unregister_methods(); + +@@ -541,7 +541,7 @@ static int hostapd_get_global_ctrl_iface(struct hapd_interfaces *interfaces, + static int hostapd_get_ctrl_iface_group(struct hapd_interfaces *interfaces, + const char *group) + { +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + struct group *grp; + grp = getgrnam(group); + if (grp == NULL) { +@@ -549,7 +549,7 @@ static int hostapd_get_ctrl_iface_group(struct hapd_interfaces *interfaces, + return -1; + } + interfaces->ctrl_iface_group = grp->gr_gid; +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + return 0; + } + +diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h +index ced36f9cc..abfccd246 100644 +--- a/src/ap/ap_config.h ++++ b/src/ap/ap_config.h +@@ -400,9 +400,9 @@ struct hostapd_bss_config { + #endif /* CONFIG_IEEE80211R_AP */ + + char *ctrl_interface; /* directory for UNIX domain sockets */ +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + gid_t ctrl_interface_gid; +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + int ctrl_interface_gid_set; + + char *ca_cert; +diff --git a/src/ap/beacon.c b/src/ap/beacon.c +index 15fc2b3db..755ac27c0 100644 +--- a/src/ap/beacon.c ++++ b/src/ap/beacon.c +@@ -10,7 +10,7 @@ + + #include "utils/includes.h" + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + + #include "utils/common.h" + #include "common/ieee802_11_defs.h" +@@ -1862,4 +1862,4 @@ int ieee802_11_update_beacons(struct hostapd_iface *iface) + return ret; + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ +diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h +index 07d0aaa92..3e6f12f98 100644 +--- a/src/ap/hostapd.h ++++ b/src/ap/hostapd.h +@@ -59,9 +59,9 @@ struct hapd_interfaces { + struct dl_list global_ctrl_dst; + char *global_iface_path; + char *global_iface_name; +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + gid_t ctrl_iface_group; +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + struct hostapd_iface **iface; + + size_t terminate_on_error; +diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c +index b404e84af..3aafa138b 100644 +--- a/src/ap/ieee802_11.c ++++ b/src/ap/ieee802_11.c +@@ -8,7 +8,7 @@ + + #include "utils/includes.h" + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + + #include "utils/common.h" + #include "utils/eloop.h" +@@ -7069,4 +7069,4 @@ u8 * hostapd_eid_wb_chsw_wrapper(struct hostapd_data *hapd, u8 *eid) + return eid; + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ +diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c +index 345a35ee1..d1e1cc557 100644 +--- a/src/crypto/tls_openssl.c ++++ b/src/crypto/tls_openssl.c +@@ -349,7 +349,7 @@ static X509_STORE * tls_crl_cert_reload(const char *ca_cert, int check_crl) + } + + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + + /* Windows CryptoAPI and access to certificate stores */ + #include +@@ -719,14 +719,14 @@ static int tls_cryptoapi_ca_cert(SSL_CTX *ssl_ctx, SSL *ssl, const char *name) + } + + +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + + static int tls_cryptoapi_cert(SSL *ssl, const char *name) + { + return -1; + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + static void ssl_info_cb(const SSL *ssl, int where, int ret) +@@ -1750,7 +1750,7 @@ static int tls_match_altsubject(X509 *cert, const char *match) + } + + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + static int domain_suffix_match(const u8 *val, size_t len, const char *match, + size_t match_len, int full) + { +@@ -1780,7 +1780,7 @@ static int domain_suffix_match(const u8 *val, size_t len, const char *match, + wpa_printf(MSG_DEBUG, "TLS: Reject due to incomplete label match"); + return 0; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + struct tls_dn_field_order_cnt { +@@ -1996,7 +1996,7 @@ static int tls_match_dn_field(X509 *cert, const char *match) + } + + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + static int tls_match_suffix_helper(X509 *cert, const char *match, + size_t match_len, int full) + { +@@ -2065,15 +2065,15 @@ static int tls_match_suffix_helper(X509 *cert, const char *match, + full ? "": "suffix "); + return 0; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + static int tls_match_suffix(X509 *cert, const char *match, int full) + { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + /* wincrypt.h has conflicting X509_NAME definition */ + return -1; +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + const char *token, *last = NULL; + + /* Process each match alternative separately until a match is found */ +@@ -2083,7 +2083,7 @@ static int tls_match_suffix(X509 *cert, const char *match, int full) + } + + return 0; +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + } + + +@@ -2773,14 +2773,14 @@ static int tls_connection_ca_cert(struct tls_data *data, + } + #endif /* ANDROID */ + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + if (ca_cert && tls_cryptoapi_ca_cert(ssl_ctx, conn->ssl, ca_cert) == + 0) { + wpa_printf(MSG_DEBUG, "OpenSSL: Added CA certificates from " + "system certificate store"); + return 0; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + if (ca_cert || ca_path) { + #ifndef OPENSSL_NO_STDIO +diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c +index b32e00967..3987b8c0b 100644 +--- a/src/drivers/driver_ndis.c ++++ b/src/drivers/driver_ndis.c +@@ -2299,7 +2299,7 @@ static int wpa_driver_ndis_get_names(struct wpa_driver_ndis_data *drv) + } + + +-#if defined(CONFIG_NATIVE_WINDOWS) || defined(__CYGWIN__) ++#if defined(CONFIG_WINDOWS) || defined(__CYGWIN__) + #ifndef _WIN32_WCE + /* + * These structures are undocumented for WinXP; only WinCE version is +@@ -2664,7 +2664,7 @@ fail: + #endif /* _WIN32_WCE */ + } + +-#else /* CONFIG_NATIVE_WINDOWS || __CYGWIN__ */ ++#else /* CONFIG_WINDOWS || __CYGWIN__ */ + + static int wpa_driver_ndis_set_wzc(struct wpa_driver_ndis_data *drv, + int enable) +@@ -2672,7 +2672,7 @@ static int wpa_driver_ndis_set_wzc(struct wpa_driver_ndis_data *drv, + return 0; + } + +-#endif /* CONFIG_NATIVE_WINDOWS || __CYGWIN__ */ ++#endif /* CONFIG_WINDOWS || __CYGWIN__ */ + + + #ifdef CONFIG_USE_NDISUIO +diff --git a/src/eap_peer/tncc.c b/src/eap_peer/tncc.c +index c46098099..c14042f1f 100644 +--- a/src/eap_peer/tncc.c ++++ b/src/eap_peer/tncc.c +@@ -7,9 +7,9 @@ + */ + + #include "includes.h" +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #include "common.h" + #include "base64.h" +@@ -258,15 +258,15 @@ static void * tncc_get_sym(void *handle, char *func) + { + void *fptr; + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #ifdef _WIN32_WCE + fptr = GetProcAddressA(handle, func); + #else /* _WIN32_WCE */ + fptr = GetProcAddress(handle, func); + #endif /* _WIN32_WCE */ +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + fptr = dlsym(handle, func); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + return fptr; + } +@@ -399,7 +399,7 @@ static int tncc_load_imc(struct tnc_if_imc *imc) + + wpa_printf(MSG_DEBUG, "TNC: Opening IMC: %s (%s)", + imc->name, imc->path); +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #ifdef UNICODE + { + TCHAR *lib = wpa_strdup_tchar(imc->path); +@@ -416,14 +416,14 @@ static int tncc_load_imc(struct tnc_if_imc *imc) + imc->name, imc->path, (int) GetLastError()); + return -1; + } +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + imc->dlhandle = dlopen(imc->path, RTLD_LAZY); + if (imc->dlhandle == NULL) { + wpa_printf(MSG_ERROR, "TNC: Failed to open IMC '%s' (%s): %s", + imc->name, imc->path, dlerror()); + return -1; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + if (tncc_imc_resolve_funcs(imc) < 0) { + wpa_printf(MSG_ERROR, "TNC: Failed to resolve IMC functions"); +@@ -446,11 +446,11 @@ static void tncc_unload_imc(struct tnc_if_imc *imc) + tnc_imc[imc->imcID] = NULL; + + if (imc->dlhandle) { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + FreeLibrary(imc->dlhandle); +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + dlclose(imc->dlhandle); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + } + os_free(imc->name); + os_free(imc->path); +@@ -876,7 +876,7 @@ enum tncc_process_res tncc_process_if_tnccs(struct tncc_data *tncc, + } + + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + static int tncc_read_config_reg(struct tncc_data *tncc, HKEY hive) + { + HKEY hk, hk2; +@@ -999,7 +999,7 @@ static int tncc_read_config(struct tncc_data *tncc) + return 0; + } + +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + + static struct tnc_if_imc * tncc_parse_imc(char *start, char *end, int *error) + { +@@ -1111,7 +1111,7 @@ static int tncc_read_config(struct tncc_data *tncc) + return 0; + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + struct tncc_data * tncc_init(void) +diff --git a/src/l2_packet/l2_packet_pcap.c b/src/l2_packet/l2_packet_pcap.c +index c2b17fcf8..fd2adcfaa 100644 +--- a/src/l2_packet/l2_packet_pcap.c ++++ b/src/l2_packet/l2_packet_pcap.c +@@ -7,9 +7,9 @@ + */ + + #include "includes.h" +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + #include + #ifndef CONFIG_WINPCAP + #include +diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c +index 4f0ff0754..bbd4dac1d 100644 +--- a/src/radius/radius_client.c ++++ b/src/radius/radius_client.c +@@ -339,7 +339,7 @@ void radius_client_set_interim_error_cb(struct radius_client_data *radius, + static int radius_client_handle_send_error(struct radius_client_data *radius, + int s, RadiusType msg_type) + { +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + int _errno = errno; + wpa_printf(MSG_INFO, "send[RADIUS,s=%d]: %s", s, strerror(errno)); + if (_errno == ENOTCONN || _errno == EDESTADDRREQ || _errno == EINVAL || +@@ -357,7 +357,7 @@ static int radius_client_handle_send_error(struct radius_client_data *radius, + return 1; + } + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + return 0; + } +@@ -1229,7 +1229,7 @@ radius_change_server(struct radius_client_data *radius, + return -1; + } + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + switch (nserv->addr.af) { + case AF_INET: + claddrlen = sizeof(claddr); +@@ -1254,7 +1254,7 @@ radius_change_server(struct radius_client_data *radius, + } + #endif /* CONFIG_IPV6 */ + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + if (auth) + radius->auth_sock = sel_sock; +diff --git a/src/utils/build_config.h b/src/utils/build_config.h +index c6f4e4379..d73d20eaa 100644 +--- a/src/utils/build_config.h ++++ b/src/utils/build_config.h +@@ -18,7 +18,7 @@ + /* Insert configuration defines, e.g., #define EAP_MD5, here, if needed. */ + + #ifdef CONFIG_WIN32_DEFAULTS +-#define CONFIG_NATIVE_WINDOWS ++#define CONFIG_WINDOWS + #define CONFIG_ANSI_C_EXTRA + #define CONFIG_WINPCAP + #define IEEE8021X_EAPOL +diff --git a/src/utils/common.c b/src/utils/common.c +index 2c1275193..8a320114c 100644 +--- a/src/utils/common.c ++++ b/src/utils/common.c +@@ -438,7 +438,7 @@ int getopt(int argc, char *const argv[], const char *optstring) + #endif /* CONFIG_ANSI_C_EXTRA */ + + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + /** + * wpa_unicode2ascii_inplace - Convert unicode string into ASCII + * @str: Pointer to string to convert +@@ -471,7 +471,7 @@ TCHAR * wpa_strdup_tchar(const char *str) + return os_strdup(str); + #endif /* UNICODE */ + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + void printf_encode(char *txt, size_t maxlen, const u8 *data, size_t len) +diff --git a/src/utils/common.h b/src/utils/common.h +index 45f72bb30..7e4162b9e 100644 +--- a/src/utils/common.h ++++ b/src/utils/common.h +@@ -62,7 +62,7 @@ static inline unsigned int bswap_32(unsigned int v) + #define bswap_32 CPU_swap_u32 + #endif /* __rtems__ */ + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #include + + typedef int socklen_t; +@@ -71,7 +71,7 @@ typedef int socklen_t; + #define MSG_DONTWAIT 0 /* not supported */ + #endif + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #ifdef _MSC_VER + #define inline __inline +@@ -129,7 +129,7 @@ typedef int8_t s8; + + /* Define platform specific byte swapping macros */ + +-#if defined(__CYGWIN__) || defined(CONFIG_NATIVE_WINDOWS) ++#if defined(__CYGWIN__) || defined(CONFIG_WINDOWS) + + static inline unsigned short wpa_swap_16(unsigned short v) + { +@@ -154,7 +154,7 @@ static inline unsigned int wpa_swap_32(unsigned int v) + + #define WPA_BYTE_SWAP_DEFINED + +-#endif /* __CYGWIN__ || CONFIG_NATIVE_WINDOWS */ ++#endif /* __CYGWIN__ || CONFIG__WINDOWS */ + + + #ifndef WPA_BYTE_SWAP_DEFINED +@@ -493,13 +493,13 @@ int wpa_snprintf_hex_uppercase(char *buf, size_t buf_size, const u8 *data, + int hwaddr_mask_txt(char *buf, size_t len, const u8 *addr, const u8 *mask); + int ssid_parse(const char *buf, struct wpa_ssid_value *ssid); + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + void wpa_unicode2ascii_inplace(TCHAR *str); + TCHAR * wpa_strdup_tchar(const char *str); +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + #define wpa_unicode2ascii_inplace(s) do { } while (0) + #define wpa_strdup_tchar(s) strdup((s)) +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + void printf_encode(char *txt, size_t maxlen, const u8 *data, size_t len); + size_t printf_decode(u8 *buf, size_t maxlen, const char *str); +diff --git a/src/utils/eloop.c b/src/utils/eloop.c +index b353ab0e4..44daa0e80 100644 +--- a/src/utils/eloop.c ++++ b/src/utils/eloop.c +@@ -958,7 +958,7 @@ int eloop_replenish_timeout(unsigned int req_secs, unsigned int req_usecs, + } + + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + static void eloop_handle_alarm(int sig) + { + wpa_printf(MSG_ERROR, "eloop: could not process SIGINT or SIGTERM in " +@@ -968,14 +968,14 @@ static void eloop_handle_alarm(int sig) + "Killing program forcefully.\n"); + exit(1); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + static void eloop_handle_signal(int sig) + { + size_t i; + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + if ((sig == SIGINT || sig == SIGTERM) && !eloop.pending_terminate) { + /* Use SIGALRM to break out from potential busy loops that + * would not allow the program to be killed. */ +@@ -983,7 +983,7 @@ static void eloop_handle_signal(int sig) + signal(SIGALRM, eloop_handle_alarm); + alarm(2); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + eloop.signaled++; + for (i = 0; i < eloop.signal_count; i++) { +@@ -1004,9 +1004,9 @@ static void eloop_process_pending_signals(void) + eloop.signaled = 0; + + if (eloop.pending_terminate) { +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + alarm(0); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + eloop.pending_terminate = 0; + } + +@@ -1055,11 +1055,11 @@ int eloop_register_signal_terminate(eloop_signal_handler handler, + int eloop_register_signal_reconfig(eloop_signal_handler handler, + void *user_data) + { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + return 0; +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + return eloop_register_signal(SIGHUP, handler, user_data); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + } + + +diff --git a/src/utils/includes.h b/src/utils/includes.h +index 741fc9c14..ba9fb6aab 100644 +--- a/src/utils/includes.h ++++ b/src/utils/includes.h +@@ -33,7 +33,7 @@ + #include + #endif /* _MSC_VER */ + +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + #include + #include + #include +@@ -41,6 +41,6 @@ + #include + #include + #endif /* __vxworks */ +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #endif /* INCLUDES_H */ +diff --git a/src/utils/ip_addr.c b/src/utils/ip_addr.c +index 92a359039..cb821f46d 100644 +--- a/src/utils/ip_addr.c ++++ b/src/utils/ip_addr.c +@@ -35,7 +35,7 @@ const char * hostapd_ip_txt(const struct hostapd_ip_addr *addr, char *buf, + + int hostapd_parse_ip_addr(const char *txt, struct hostapd_ip_addr *addr) + { +-#ifndef CONFIG_NATIVE_WINDOWS ++#ifndef CONFIG_WINDOWS + if (inet_aton(txt, &addr->u.v4)) { + addr->af = AF_INET; + return 0; +@@ -47,7 +47,7 @@ int hostapd_parse_ip_addr(const char *txt, struct hostapd_ip_addr *addr) + return 0; + } + #endif /* CONFIG_IPV6 */ +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + return -1; + } +diff --git a/src/utils/os_win32.c b/src/utils/os_win32.c +index f9e4b308e..25087ecde 100644 +--- a/src/utils/os_win32.c ++++ b/src/utils/os_win32.c +@@ -159,22 +159,22 @@ char * os_rel2abs_path(const char *rel_path) + + int os_program_init(void) + { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + WSADATA wsaData; + if (WSAStartup(MAKEWORD(2, 0), &wsaData)) { + printf("Could not find a usable WinSock.dll\n"); + return -1; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + return 0; + } + + + void os_program_deinit(void) + { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + WSACleanup(); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + } + + +diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c +index ba3924d06..5855509b6 100644 +--- a/src/utils/pcsc_funcs.c ++++ b/src/utils/pcsc_funcs.c +@@ -519,11 +519,11 @@ struct scard_data * scard_init(const char *reader) + #endif + unsigned long pos; + struct scard_data *scard; +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + TCHAR *readers = NULL; +-#else /* CONFIG_NATIVE_WINDOWS */ ++#else /* CONFIG_WINDOWS */ + char *readers = NULL; +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + unsigned char buf[100]; + size_t blen; + int transaction = 0; +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index f539ce134..e323b28d5 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -117,7 +117,7 @@ OBJS_d = + OBJS_priv = + + ifndef CONFIG_OS +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_OS=win32 + else + CONFIG_OS=unix +@@ -853,7 +853,7 @@ L_CFLAGS += -DEAP_TNC + OBJS += src/eap_peer/eap_tnc.c + OBJS += src/eap_peer/tncc.c + NEED_BASE64=y +-ifndef CONFIG_NATIVE_WINDOWS ++ifndef CONFIG_WINDOWS + ifndef CONFIG_DRIVER_BSD + LIBS += -ldl + endif +@@ -989,7 +989,7 @@ ifdef CONFIG_PCSC + L_CFLAGS += -DPCSC_FUNCS -I/usr/include/PCSC + OBJS += src/utils/pcsc_funcs.c + # -lpthread may not be needed depending on how pcsc-lite was configured +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + #Once MinGW gets support for WinScard, -lwinscard could be used instead of the + #dynamic symbol loading that is now used in pcsc_funcs.c + #LIBS += -lwinscard +@@ -1208,7 +1208,7 @@ endif + + ifdef TLS_FUNCS + ifdef CONFIG_SMARTCARD +-ifndef CONFIG_NATIVE_WINDOWS ++ifndef CONFIG_WINDOWS + ifneq ($(CONFIG_L2_PACKET), freebsd) + LIBS += -ldl + endif +@@ -1444,7 +1444,7 @@ endif + + ifdef CONFIG_CTRL_IFACE + ifeq ($(CONFIG_CTRL_IFACE), y) +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_CTRL_IFACE=named_pipe + else + CONFIG_CTRL_IFACE=unix +@@ -1504,8 +1504,8 @@ OBJS_c += src/utils/edit_simple.c + endif + endif + +-ifdef CONFIG_NATIVE_WINDOWS +-L_CFLAGS += -DCONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS ++L_CFLAGS += -DCONFIG_WINDOWS + LIBS += -lws2_32 -lgdi32 -lcrypt32 + LIBS_c += -lws2_32 + LIBS_p += -lws2_32 -lgdi32 +diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog +index 34318f489..78b11b99a 100644 +--- a/wpa_supplicant/ChangeLog ++++ b/wpa_supplicant/ChangeLog +@@ -1416,7 +1416,7 @@ ChangeLog for wpa_supplicant + are converted internally to the new format), but all drivers should + start using the new get_scan_results2() to make them more likely to + work with new features +- * Qt4 version of wpa_gui (wpa_gui-qt4 subdirectory) is now native Qt4 ++ * Qt4 version of wpa_gui (wpa_gui-qt4 subdirectory) is now built-in Qt4 + application, i.e., it does not require Qt3Support anymore; Windows + binary of wpa_gui.exe is now from this directory and only requires + QtCore4.dll and QtGui4.dll libraries +@@ -2108,7 +2108,7 @@ ChangeLog for wpa_supplicant + only for driver_hostapd.c, but the changes should be trivial to add + in associate() handler for other drivers, too (assuming the driver + supports WPA-None) +- * added preliminary port for native Windows (i.e., no cygwin) using ++ * added preliminary port for built-in Windows (i.e., no cygwin) using + mingw + + 2005-01-02 - v0.3.3 +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index 271f2aab3..c06055600 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -108,7 +108,7 @@ OBJS_c += ../src/common/cli.o + OBJS += wmm_ac.o + + ifndef CONFIG_OS +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_OS=win32 + else + CONFIG_OS=unix +@@ -864,7 +864,7 @@ CFLAGS += -DEAP_TNC + OBJS += ../src/eap_peer/eap_tnc.o + OBJS += ../src/eap_peer/tncc.o + NEED_BASE64=y +-ifndef CONFIG_NATIVE_WINDOWS ++ifndef CONFIG_WINDOWS + ifndef CONFIG_DRIVER_BSD + LIBS += -ldl + endif +@@ -1012,7 +1012,7 @@ ifdef CONFIG_PCSC + CFLAGS += -DPCSC_FUNCS -I/usr/include/PCSC + OBJS += ../src/utils/pcsc_funcs.o + # -lpthread may not be needed depending on how pcsc-lite was configured +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + #Once MinGW gets support for WinScard, -lwinscard could be used instead of the + #dynamic symbol loading that is now used in pcsc_funcs.c + #LIBS += -lwinscard +@@ -1294,7 +1294,7 @@ endif + + ifdef TLS_FUNCS + ifdef CONFIG_SMARTCARD +-ifndef CONFIG_NATIVE_WINDOWS ++ifndef CONFIG_WINDOWS + ifneq ($(CONFIG_L2_PACKET), freebsd) + LIBS += -ldl + endif +@@ -1569,7 +1569,7 @@ endif + + ifdef CONFIG_CTRL_IFACE + ifeq ($(CONFIG_CTRL_IFACE), y) +-ifdef CONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS + CONFIG_CTRL_IFACE=named_pipe + else + CONFIG_CTRL_IFACE=unix +@@ -1642,8 +1642,8 @@ OBJS_c += ../src/utils/edit_simple.o + endif + endif + +-ifdef CONFIG_NATIVE_WINDOWS +-CFLAGS += -DCONFIG_NATIVE_WINDOWS ++ifdef CONFIG_WINDOWS ++CFLAGS += -DCONFIG_WINDOWS + LIBS += -lws2_32 -lgdi32 -lcrypt32 + LIBS_c += -lws2_32 + LIBS_p += -lws2_32 -lgdi32 +diff --git a/wpa_supplicant/README-Windows.txt b/wpa_supplicant/README-Windows.txt +index 7288abd9a..8015c6701 100644 +--- a/wpa_supplicant/README-Windows.txt ++++ b/wpa_supplicant/README-Windows.txt +@@ -191,7 +191,7 @@ scanning; this allows APs with hidden SSIDs to be used) + wpa_cli.exe and wpa_gui.exe can be used to interact with the + wpa_supplicant.exe program in the same way as with Linux. Note that + ctrl_interface is using UNIX domain sockets when built for cygwin, but +-the native build for Windows uses named pipes and the contents of the ++the build for Windows uses named pipes and the contents of the + ctrl_interface configuration item is used to control access to the + interface. Anyway, this variable has to be included in the configuration + to enable the control interface. +diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config +index 283f8eb0a..444f7b238 100644 +--- a/wpa_supplicant/android.config ++++ b/wpa_supplicant/android.config +@@ -46,8 +46,8 @@ CONFIG_DRIVER_NL80211_QCA=y + #CONFIG_DRIVER_NDIS=y + #CFLAGS += -I/usr/include/w32api/ddk + #LIBS += -L/usr/local/lib +-# For native build using mingw +-#CONFIG_NATIVE_WINDOWS=y ++# For build using mingw ++#CONFIG_WINDOWS=y + # Additional directories for cross-compilation on Linux host for mingw target + #CFLAGS += -I/opt/mingw/mingw32/include/ddk + #LIBS += -L/opt/mingw/mingw32/lib +diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c +index f4a6c0afd..f52199f1f 100644 +--- a/wpa_supplicant/ctrl_iface.c ++++ b/wpa_supplicant/ctrl_iface.c +@@ -61,7 +61,7 @@ + + #ifdef __NetBSD__ + #include +-#elif !defined(__CYGWIN__) && !defined(CONFIG_NATIVE_WINDOWS) ++#elif !defined(__CYGWIN__) && !defined(CONFIG_WINDOWS) + #include + #endif + +diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig +index 708a82385..7524e60db 100644 +--- a/wpa_supplicant/defconfig ++++ b/wpa_supplicant/defconfig +@@ -58,8 +58,8 @@ CONFIG_LIBNL32=y + #CONFIG_DRIVER_NDIS=y + #CFLAGS += -I/usr/include/w32api/ddk + #LIBS += -L/usr/local/lib +-# For native build using mingw +-#CONFIG_NATIVE_WINDOWS=y ++# For build using mingw ++#CONFIG_WINDOWS=y + # Additional directories for cross-compilation on Linux host for mingw target + #CFLAGS += -I/opt/mingw/mingw32/include/ddk + #LIBS += -L/opt/mingw/mingw32/lib +diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c +index e256ac50e..9f1e8ba5f 100644 +--- a/wpa_supplicant/eapol_test.c ++++ b/wpa_supplicant/eapol_test.c +@@ -1013,7 +1013,7 @@ static void wpa_init_conf(struct eapol_test_data *e, + e->radius_conf->num_auth_servers = 1; + as = os_zalloc(sizeof(struct hostapd_radius_server)); + assert(as != NULL); +-#if defined(CONFIG_NATIVE_WINDOWS) || defined(CONFIG_ANSI_C_EXTRA) ++#if defined(CONFIG_WINDOWS) || defined(CONFIG_ANSI_C_EXTRA) + { + int a[4]; + u8 *pos; +@@ -1025,13 +1025,13 @@ static void wpa_init_conf(struct eapol_test_data *e, + *pos++ = a[3]; + as->addr.af = AF_INET; + } +-#else /* CONFIG_NATIVE_WINDOWS or CONFIG_ANSI_C_EXTRA */ ++#else /* CONFIG_WINDOWS or CONFIG_ANSI_C_EXTRA */ + if (hostapd_parse_ip_addr(authsrv, &as->addr) < 0) { + wpa_printf(MSG_ERROR, "Invalid IP address '%s'", + authsrv); + assert(0); + } +-#endif /* CONFIG_NATIVE_WINDOWS or CONFIG_ANSI_C_EXTRA */ ++#endif /* CONFIG_WINDOWS or CONFIG_ANSI_C_EXTRA */ + as->port = port; + as->shared_secret = (u8 *) os_strdup(secret); + as->shared_secret_len = os_strlen(secret); +diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak +index 617df036a..c119af1f4 100644 +--- a/wpa_supplicant/nmake.mak ++++ b/wpa_supplicant/nmake.mak +@@ -23,7 +23,7 @@ OPENSSLDIR=C:\dev\openssl + CC = cl + OBJDIR = objs + +-CFLAGS = /DCONFIG_NATIVE_WINDOWS ++CFLAGS = /DCONFIG_WINDOWS + CFLAGS = $(CFLAGS) /DCONFIG_NDIS_EVENTS_INTEGRATED + CFLAGS = $(CFLAGS) /DCONFIG_ANSI_C_EXTRA + CFLAGS = $(CFLAGS) /DCONFIG_WINPCAP +diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c +index cf107ebaf..975ea5165 100644 +--- a/wpa_supplicant/rrm.c ++++ b/wpa_supplicant/rrm.c +@@ -99,7 +99,7 @@ void wpas_rrm_process_neighbor_rep(struct wpa_supplicant *wpa_s, + } + + +-#if defined(__CYGWIN__) || defined(CONFIG_NATIVE_WINDOWS) ++#if defined(__CYGWIN__) || defined(CONFIG_WINDOWS) + /* Workaround different, undefined for Windows, error codes used here */ + #ifndef ENOTCONN + #define ENOTCONN -1 +diff --git a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp +index 7d92f63d1..f8a3adf42 100644 +--- a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp +@@ -14,7 +14,7 @@ + #include "wpagui.h" + #include "addinterface.h" + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #include + + #ifndef WPA_KEY_ROOT +@@ -23,7 +23,7 @@ + #ifndef WPA_KEY_PREFIX + #define WPA_KEY_PREFIX TEXT("SOFTWARE\\wpa_supplicant") + #endif +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + AddInterface::AddInterface(WpaGui *_wpagui, QWidget *parent) +@@ -98,7 +98,7 @@ void AddInterface::addInterfaces() + } + + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + bool AddInterface::addRegistryInterface(const QString &ifname) + { + HKEY hk, ihk; +@@ -176,7 +176,7 @@ bool AddInterface::addRegistryInterface(const QString &ifname) + RegCloseKey(ihk); + return true; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + void AddInterface::interfaceSelected(QTreeWidgetItem *sel) +@@ -226,13 +226,13 @@ void AddInterface::interfaceSelected(QTreeWidgetItem *sel) + + #endif /* CONFIG_CTRL_IFACE_NAMED_PIPE */ + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + if (!addRegistryInterface(sel->text(1))) { + QMessageBox::information(this, "wpa_gui", + tr("Failed to add the interface into " + "registry.")); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + wpagui->selectAdapter(sel->text(1)); + close(); +diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp +index bbd45c6e1..7fb6b25ec 100644 +--- a/wpa_supplicant/wpa_gui-qt4/main.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/main.cpp +@@ -6,9 +6,9 @@ + * See README for more details. + */ + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + #include + #include + #include +@@ -47,21 +47,21 @@ int main(int argc, char *argv[]) + + WpaGui w(&app); + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + WSADATA wsaData; + if (WSAStartup(MAKEWORD(2, 0), &wsaData)) { + /* printf("Could not find a usable WinSock.dll\n"); */ + return -1; + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + app.w = &w; + + ret = app.exec(); + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + WSACleanup(); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + return ret; + } +diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +index 3fa734b57..5d51d90a0 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro ++++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +@@ -9,18 +9,18 @@ DEFINES += CONFIG_CTRL_IFACE + + win32 { + LIBS += -lws2_32 -static +- DEFINES += CONFIG_NATIVE_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE ++ DEFINES += CONFIG_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE + SOURCES += ../../src/utils/os_win32.c + } else:win32-g++ { + # cross compilation to win32 + LIBS += -lws2_32 -static -mwindows +- DEFINES += CONFIG_NATIVE_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE ++ DEFINES += CONFIG_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE + SOURCES += ../../src/utils/os_win32.c + RESOURCES += icons_png.qrc + } else:win32-x-g++ { + # cross compilation to win32 + LIBS += -lws2_32 -static -mwindows +- DEFINES += CONFIG_NATIVE_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE ++ DEFINES += CONFIG_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE + DEFINES += _X86_ + SOURCES += ../../src/utils/os_win32.c + RESOURCES += icons_png.qrc +diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +index 9404ab424..caa318cfc 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +@@ -6,9 +6,9 @@ + * See README for more details. + */ + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + #include +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + #include + #include +@@ -40,7 +40,7 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, + setupUi(this); + this->setWindowFlags(Qt::Dialog); + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + fileStopServiceAction = new QAction(this); + fileStopServiceAction->setObjectName("Stop Service"); + fileStopServiceAction->setIconText(tr("Stop Service")); +@@ -62,7 +62,7 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, + + connect(addInterfaceAction, SIGNAL(triggered()), this, + SLOT(addInterface())); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + (void) statusBar(); + +@@ -340,7 +340,7 @@ int WpaGui::openCtrlConnection(const char *ifname) + } + + if (ctrl_iface == NULL) { +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + static bool first = true; + if (first && !serviceRunning()) { + first = false; +@@ -353,7 +353,7 @@ int WpaGui::openCtrlConnection(const char *ifname) + QMessageBox::Yes) + startService(); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + return -1; + } + +@@ -511,7 +511,7 @@ void WpaGui::updateStatus() + updateTrayIcon(TrayIconOffline); + signalMeterTimer->stop(); + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + static bool first = true; + if (first && connectedToService && + (ctrl_iface == NULL || *ctrl_iface == '\0')) { +@@ -524,7 +524,7 @@ void WpaGui::updateStatus() + QMessageBox::Yes) + addInterface(); + } +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + return; + } + +@@ -1760,7 +1760,7 @@ void WpaGui::stopWpsRun(bool success) + } + + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + + #ifndef WPASVC_NAME + #define WPASVC_NAME TEXT("wpasvc") +@@ -1886,7 +1886,7 @@ bool WpaGui::serviceRunning() + return running; + } + +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + + void WpaGui::addInterface() +diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h +index f0a34c97e..a210fe042 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h ++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h +@@ -108,10 +108,10 @@ public slots: + virtual void wpsGeneratePin(); + virtual void wpsApPinChanged(const QString &text); + virtual void wpsApPin(); +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + virtual void startService(); + virtual void stopService(); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + virtual void addInterface(); + + protected slots: +@@ -161,12 +161,12 @@ private: + QTimer *signalMeterTimer; + int signalMeterInterval; + +-#ifdef CONFIG_NATIVE_WINDOWS ++#ifdef CONFIG_WINDOWS + QAction *fileStartServiceAction; + QAction *fileStopServiceAction; + + bool serviceRunning(); +-#endif /* CONFIG_NATIVE_WINDOWS */ ++#endif /* CONFIG_WINDOWS */ + + QAction *addInterfaceAction; + AddInterface *add_iface; +-- +2.32.0.402.g57bb445576-goog +