{"id":2226363,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2226363/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-10-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.2/projects/22/?format=json","name":"HostAP Development","link_name":"hostap","list_id":"hostap.lists.infradead.org","list_email":"hostap@lists.infradead.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422122424.43776-10-andrei.otcheretianski@intel.com>","list_archive_url":null,"date":"2026-04-22T12:23:00","name":"[09/92] NAN: Add pairing configuration","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4c18014dd012d7b3431209245c9c39dbe1392bdd","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.2/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-10-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501001,"url":"http://patchwork.ozlabs.org/api/1.2/series/501001/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/list/?series=501001","date":"2026-04-22T12:23:05","name":"Add NAN PASN pairing support","version":1,"mbox":"http://patchwork.ozlabs.org/series/501001/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226363/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226363/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=IOzkSC8K;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=MpmqgQK0;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0z2l1D3Kz1yHB\n\tfor ; Wed, 22 Apr 2026 22:25:30 +1000 (AEST)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWdS-0000000A2TH-04zV;\n\tWed, 22 Apr 2026 12:24:54 +0000","from mgamail.intel.com ([192.198.163.17])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWdN-0000000A2R5-0RLD\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:24:50 +0000","from orviesa010.jf.intel.com ([10.64.159.150])\n by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:24:48 -0700","from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:24:48 -0700"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=aOpV10yutW7cgo5oJPObyVFTym9lg3AlZj/0eEhyAPY=; b=IOzkSC8KEQToo4\n\tOx4iblyyIyub+gylP7nPiZ1Xpzcv7JvNAw+bHsalQDetgGorKf25s8nzwOUzOTUS1NTiPz9XJ9iOr\n\thMdgtkxqdtAYg14POloZ3XvUpWtNKHuEMCH3ehbCeHKxWCJ7W0dbm7H2LkTguLiSobkNoQkTTC78Y\n\tmEPIVINVMLE7emDy5PQosyhbUiq0Kl57gOzos9wea8QaIc0Yo/BZCbqphqdYHIEC91RHCxhgwo/ak\n\tPvaz2udvfyhxEUaAbfrvYCSVHZKtiAp9Cvc/Etd23Kj2LPeufFt44KqN9aVsOUN1CuVHGblK8lY3o\n\tMFEYElAHVFTY0v+0uBBg==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860689; x=1808396689;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=K/6+Osqfcucz6Nl8nlEizMP2f1s8/ZoFHOgLjH7kTls=;\n b=MpmqgQK00Y+t2WDlkPJasAHPig2KFmg4FwVba5iV/30oFCK3Ib3jD4LA\n MINwVe2yqCgQWaNKuq7XKstt1NnskfymqOc9cbzWyOtLsrdBDYeywXSqY\n pBTBpIOePCBVO/QzMRFSa2SU92zlKewxue6BSaMoFSJqW7U1crAgZqrws\n O5B19hZLvqWkZmfE+ZpDHonjVN7PtgJkXivPPzdXhwh624bLJcbaAp29x\n 4aSxdabIApMiGAauYVbSL/Yq3334pHzedAEQqmRq7TI2BX12ZiZguw78U\n bPDDRkmuCa8yrE+E/QP9dlrmnTjTQWc+yhyW5AId4czmezVeZ2KEWyj8P\n g==;"],"X-CSE-ConnectionGUID":["EI9K0LqOS4qE3FbwrGKoFw==","Bh2kwktdTeq3LUWbJwrqcg=="],"X-CSE-MsgGUID":["hndZSPKQROKbajdwRnQeZg==","4vtBMMMIQPKVm8/AwNCKKw=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11764\"; a=\"77687136\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687136\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231444859\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Cc":"vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tAvraham Stern ","Subject":"[PATCH 09/92] NAN: Add pairing configuration","Date":"Wed, 22 Apr 2026 15:23:00 +0300","Message-ID":"<20260422122424.43776-10-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260422122424.43776-1-andrei.otcheretianski@intel.com>","References":"<20260422122424.43776-1-andrei.otcheretianski@intel.com>","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20260422_052449_155574_AEC851F5 ","X-CRM114-Status":"GOOD ( 13.05 )","X-Spam-Score":"-4.4 (----)","X-Spam-Report":"Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: Avraham Stern Move NAN\n pairing\n capabilities into a dedicated struct. Add configurations for enabling NAN\n pairing setup,\n NPK caching and NPK verification. Signed-off-by: Avraham Stern\n --- src/nan/nan.h | 20 +++++++++++++++++++-\n src/nan/nan_module_tests.c\n | 5 ++--- src/nan/nan_util.c | 14 +++++++++++--- 3 files changed, 32 inser\n [...]\n Content analysis details: (-4.4 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,\n medium trust\n [192.198.163.17 listed in list.dnswl.org]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender","X-BeenThere":"hostap@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Hostap\" ","Errors-To":"hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"From: Avraham Stern \n\nMove NAN pairing capabilities into a dedicated struct.\nAdd configurations for enabling NAN pairing setup, NPK caching\nand NPK verification.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.h | 20 +++++++++++++++++++-\n src/nan/nan_module_tests.c | 5 ++---\n src/nan/nan_util.c | 14 +++++++++++---\n 3 files changed, 32 insertions(+), 7 deletions(-)","diff":"diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 1c7ae59cb0..66e078a621 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -385,6 +385,23 @@ struct nan_peer_potential_avail {\n \t} maps[NAN_MAX_MAPS];\n };\n \n+#define NAN_PAIRING_PASN_128 BIT(0)\n+#define NAN_PAIRING_PASN_256 BIT(1)\n+\n+/**\n+ * struct nan_pairing_cfg - NAN pairing configuration parameters\n+ * @pairing_setup: Whether pairing setup is enabled\n+ * @npk_caching: Whether NPK caching is enabled\n+ * @pairing_verification: Whether pairing verification is enabled\n+ * @cipher_suites: Bitmap of supported cipher suites (NAN_PAIRING_PASN_*)\n+ */\n+struct nan_pairing_cfg {\n+\tbool pairing_setup;\n+\tbool npk_caching;\n+\tbool pairing_verification;\n+\tu32 cipher_suites;\n+};\n+\n struct nan_config {\n \tvoid *cb_ctx;\n \tu8 nmi_addr[ETH_ALEN];\n@@ -393,7 +410,8 @@ struct nan_config {\n \n \t/* Wi-Fi Aware spec v4.0, Table 141 (Capability Info field) */\n \tu8 dev_capa_ext_reg_info; /* NAN_DEV_CAPA_EXT_INFO_0_* */\n-\tu8 dev_capa_ext_pairing_npk_caching; /* NAN_DEV_CAPA_EXT_INFO_1_* */\n+\n+\tstruct nan_pairing_cfg pairing_cfg;\n \n \t/*\n \t * Supported Pairing Bootstrapping Methods (PBM).\ndiff --git a/src/nan/nan_module_tests.c b/src/nan/nan_module_tests.c\nindex 81eeba0f12..f04aba1c68 100644\n--- a/src/nan/nan_module_tests.c\n+++ b/src/nan/nan_module_tests.c\n@@ -913,9 +913,8 @@ static int nan_test_dev_init(struct nan_device *dev)\n \tnan.dev_capa.capa = 0;\n \n \tnan.dev_capa_ext_reg_info = 0;\n-\tnan.dev_capa_ext_pairing_npk_caching =\n-\t\tNAN_DEV_CAPA_EXT_INFO_1_PAIRING_SETUP |\n-\t\tNAN_DEV_CAPA_EXT_INFO_1_NPK_NIK_CACHING;\n+\tnan.pairing_cfg.npk_caching = true;\n+\tnan.pairing_cfg.pairing_setup = true;\n \n \tdev->nan = nan_init(&nan);\n \tif (!dev->nan) {\ndiff --git a/src/nan/nan_util.c b/src/nan/nan_util.c\nindex bc5783a27a..31df1c848e 100644\n--- a/src/nan/nan_util.c\n+++ b/src/nan/nan_util.c\n@@ -392,14 +392,22 @@ int nan_add_csia(struct wpabuf *buf, u8 capab, size_t cs_list_len,\n */\n void nan_add_dev_capa_ext_attr(struct nan_data *nan, struct wpabuf *buf)\n {\n-\tif (!nan->cfg->dev_capa_ext_reg_info &&\n-\t !nan->cfg->dev_capa_ext_pairing_npk_caching)\n+\tu8 pairing_and_npk_caching = 0;\n+\n+\tif (nan->cfg->pairing_cfg.pairing_setup)\n+\t\tpairing_and_npk_caching |=\n+\t\t NAN_DEV_CAPA_EXT_INFO_1_PAIRING_SETUP;\n+\tif (nan->cfg->pairing_cfg.npk_caching)\n+\t\tpairing_and_npk_caching |=\n+\t\t NAN_DEV_CAPA_EXT_INFO_1_NPK_NIK_CACHING;\n+\n+\tif (!nan->cfg->dev_capa_ext_reg_info && !pairing_and_npk_caching)\n \t\treturn;\n \n \twpabuf_put_u8(buf, NAN_ATTR_DCEA);\n \twpabuf_put_le16(buf, 2);\n \twpabuf_put_u8(buf, nan->cfg->dev_capa_ext_reg_info);\n-\twpabuf_put_u8(buf, nan->cfg->dev_capa_ext_pairing_npk_caching);\n+\twpabuf_put_u8(buf, pairing_and_npk_caching);\n }\n \n \n","prefixes":["09/92"]}