Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226361/?format=api
{ "id": 2226361, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226361/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-14-andrei.otcheretianski@intel.com/", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.2/projects/22/?format=api", "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-14-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:23:04", "name": "[13/92] NAN: Add NIRA to NAN IE when pairing verification is enabled", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e5827fdbc70206d384d401ccf4e843a8bdbda64b", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.2/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-14-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 501001, "url": "http://patchwork.ozlabs.org/api/1.2/series/501001/?format=api", "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/2226361/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226361/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "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=GkUHhdPB;\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=SKxSqMCk;\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 4g0z2k0bDVz23cl\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:25:32 +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 1wFWdX-0000000A2as-0yJP;\n\tWed, 22 Apr 2026 12:24:59 +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 1wFWdT-0000000A2Ve-353L\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:24:57 +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:55 -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:54 -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=B/HL/nrmwmy6HgFBXVkcI/9Wb6yNjaV7ctCLtQYqC18=; b=GkUHhdPBNKIy//\n\txy2eB1L4UozOPrb9IOsYbdloug2ErFYZXCt6DIqWIq7YvNnBjRxHsPGkzlYNBkCeiz1jRjlms9tPq\n\thkmAPANg3lR3S5iZy+mCmjBtkyC8S4Xj0zzVsOOmISIAAJmGOJEvGAxQAieNFXmWpXYIy5e1rtLUt\n\tU/Mkg2bhLP1RQ3jEK1tFihpVCxiY9v/qKas38CRFEltED2AmdBeIoZITwkKNCDHDCVABrEoOeTiez\n\tHst4rc41wDI90WQbPsJrLDXrxmvNHRSuD1F1ONy9/7/p3WHkmGaX6w2IB2ULBo0y40qHOCkKllIc3\n\tlfxayUtF3rRCS1Rcrcdg==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860695; x=1808396695;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=WAql5lTRTLDLMIfgHCm291cNuy8Jz6Kwqcmvia9h+l0=;\n b=SKxSqMCkRMVroc6ppEAu30ez433zzaHmIYnIX56DugxFtPQPG4BEfoOs\n gal0B8Tyyg2HEYRbKQzih+2A/iXvaQClpNlH4qrsQ67mXQ24szt10T1Dx\n /jaXiV3Mw2mzd1GvNqCdSqrTKt8YWcmWJh1IgTp+DZIYvteUp6+qlrFyG\n XtHkFczlX6h/4c03Eu3/ham4OWJEMfzLLRf5sTUd+2wX7y9o0zdznvbj0\n OOHSSW/9eSa5BPR1/DxepZL6TzyzF4Xlu4twP8nKrvvQhUXSxZm0O3afV\n 3xYRvZwOfX0rxXOYZEMUiW44+50ex6wjFm0PfACli2z+mrblZ06TtDyV8\n A==;" ], "X-CSE-ConnectionGUID": [ "Wi2/X8x5SSCPcPZCUuUt8Q==", "sTZdN7h0Qhu54uxQtbqkKA==" ], "X-CSE-MsgGUID": [ "nc5+qYp3Sk2ZQechwJJASg==", "ckFAZ5RiT9mjV620PtjEwA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687166\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687166\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231444884\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Cc": "vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tAvraham Stern <avraham.stern@intel.com>", "Subject": "[PATCH 13/92] NAN: Add NIRA to NAN IE when pairing verification is\n enabled", "Date": "Wed, 22 Apr 2026 15:23:04 +0300", "Message-ID": "<20260422122424.43776-14-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_052455_784516_688CED61 ", "X-CRM114-Status": "GOOD ( 16.60 )", "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 <avraham.stern@intel.com> Add the NAN\n Identity Resolution attribute (NIRA) to the NAN IE if pairing verification\n is enabled. Signed-off-by: Avraham Stern <avraham.stern@intel.com> ---\n src/nan/nan.c\n | 7 +++++++ src/nan/nan_i.h | 18 ++++++++++++++++ src/nan/nan_pairing.c |\n 49 +++++++++++++++++++++++++++++++++++++++++++ src/na [...]\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": "<hostap.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/hostap/>", "List-Post": "<mailto:hostap@lists.infradead.org>", "List-Help": "<mailto:hostap-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"Hostap\" <hostap-bounces@lists.infradead.org>", "Errors-To": "hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "From: Avraham Stern <avraham.stern@intel.com>\n\nAdd the NAN Identity Resolution attribute (NIRA) to the NAN IE if\npairing verification is enabled.\n\nSigned-off-by: Avraham Stern <avraham.stern@intel.com>\n---\n src/nan/nan.c | 7 +++++++\n src/nan/nan_i.h | 18 ++++++++++++++++\n src/nan/nan_pairing.c | 49 +++++++++++++++++++++++++++++++++++++++++++\n src/nan/nan_util.c | 33 +++++++++++++++++++++++++++++\n 4 files changed, 107 insertions(+)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 969b37d712..3da56f4854 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -35,6 +35,13 @@ struct nan_data * nan_init(const struct nan_config *cfg)\n \tif (!nan)\n \t\treturn NULL;\n \n+\tif (cfg->pairing_cfg.pairing_verification &&\n+\t nan_nira_get_tag_nonce(cfg, nan->nira_nonce, nan->nira_tag) < 0) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to get NIRA tag and nonce\");\n+\t\tos_free(nan);\n+\t\treturn NULL;\n+\t}\n+\n \tnan->cfg = os_memdup(cfg, sizeof(*cfg));\n \tif (!nan->cfg) {\n \t\tos_free(nan);\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 323274312b..d917b48ffb 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -482,6 +482,8 @@ struct nan_peer {\n * @next_dialog_token: Dialog token for NDP and NDL negotiations. Incremented\n * for each NDP and NDL request.\n * @cluster_id: Current cluster ID\n+ * @nira_nonce: Nonce for NAN Identity Resolution attribute (NIRA)\n+ * @nira_tag: Tag for NAN Identity Resolution attribute (NIRA)\n */\n struct nan_data {\n \tstruct nan_config *cfg;\n@@ -492,6 +494,9 @@ struct nan_data {\n \tu8 next_dialog_token;\n \n \tu8 cluster_id[ETH_ALEN];\n+\n+\tu8 nira_nonce[NAN_NIRA_NONCE_LEN];\n+\tu8 nira_tag[NAN_NIRA_TAG_LEN];\n };\n \n struct nan_attrs_entry {\n@@ -684,5 +689,18 @@ bool nan_bootstrap_handle_rx(struct nan_data *nan, const u8 *peer_nmi,\n \t\t\t const u8 *npba, u16 npba_len,\n \t\t\t const u8 *buf, size_t len,\n \t\t\t int handle, u8 req_instance_id);\n+int nan_add_nira_attr(struct wpabuf *buf, const u8 *nira_tag,\n+\t\t const u8 *nira_nonce);\n+#ifdef CONFIG_PASN\n+int nan_nira_get_tag_nonce(const struct nan_config *nan, u8 *nira_nonce,\n+\t\t\t u8 *nira_tag);\n+#else\n+static inline\n+int nan_nira_get_tag_nonce(const struct nan_config *nan, u8 *nira_nonce,\n+\t\t\t u8 *nira_tag)\n+{\n+\treturn -1;\n+}\n+#endif /* CONFIG_PASN */\n \n #endif /* NAN_I_H */\ndiff --git a/src/nan/nan_pairing.c b/src/nan/nan_pairing.c\nindex 49cfa17073..60c523c64e 100644\n--- a/src/nan/nan_pairing.c\n+++ b/src/nan/nan_pairing.c\n@@ -10,6 +10,47 @@\n #include \"common.h\"\n #include \"nan/nan_i.h\"\n \n+/*\n+ * nan_nira_get_tag_nonce - Generate NIRA nonce and compute NIRA tag\n+ *\n+ * @nan: Pointer to NAN configuration structure\n+ * @nira_nonce: Buffer to store the generated NIRA nonce (output)\n+ * @nira_tag: Buffer to store the computed NIRA tag (output)\n+ * Returns: 0 on success, -1 on failure\n+ *\n+ * This function generates a random NIRA (NAN Identity Resolution Attribute)\n+ * nonce and derives the corresponding NIRA tag using the\n+ * NIK (NAN Identity Key), NMI address, and the generated nonce.\n+ *\n+ * The caller must ensure that nira_nonce buffer is at least NAN_NIRA_NONCE_LEN\n+ * bytes and nira_tag buffer is at least NAN_NIRA_TAG_LEN bytes.\n+ */\n+int nan_nira_get_tag_nonce(const struct nan_config *nan, u8 *nira_nonce,\n+\t\t\t u8 *nira_tag)\n+{\n+\tstruct wpabuf *tag_buf;\n+\n+\tif (os_get_random(nira_nonce, NAN_NIRA_NONCE_LEN) < 0) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to generate NIRA nonce\");\n+\t\treturn -1;\n+\t}\n+\n+\ttag_buf = nan_crypto_derive_nira_tag(nan->nik, NAN_NIK_LEN,\n+\t\t\t\t\t nan->nmi_addr, nira_nonce);\n+\tif (!tag_buf)\n+\t\treturn -1;\n+\n+\tos_memcpy(nira_tag, wpabuf_head(tag_buf), NAN_NIRA_TAG_LEN);\n+\twpabuf_free(tag_buf);\n+\n+\twpa_hexdump_key(MSG_DEBUG, \"NAN: NIK\", nan->nik, NAN_NIK_LEN);\n+\twpa_hexdump(MSG_DEBUG, \"NAN: NIRA-NONCE\", nira_nonce,\n+\t\t NAN_NIRA_NONCE_LEN);\n+\twpa_hexdump(MSG_DEBUG, \"NAN: NIRA-TAG\", nira_tag, NAN_NIRA_TAG_LEN);\n+\treturn 0;\n+}\n+\n+\n /*\n * nan_pairing_add_attrs - Add NAN pairing attributes to a buffer\n *\n@@ -28,5 +69,13 @@ int nan_pairing_add_attrs(struct nan_data *nan, struct wpabuf *buf)\n \n \tnan_add_dev_capa_ext_attr(nan, buf);\n \n+\tif (nan->cfg->pairing_cfg.pairing_verification) {\n+\t\tif (nan_add_nira_attr(buf, nan->nira_tag, nan->nira_nonce)) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Failed to add NIRA attribute\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n \treturn 0;\n }\ndiff --git a/src/nan/nan_util.c b/src/nan/nan_util.c\nindex 31df1c848e..3c9b7fd871 100644\n--- a/src/nan/nan_util.c\n+++ b/src/nan/nan_util.c\n@@ -410,6 +410,39 @@ void nan_add_dev_capa_ext_attr(struct nan_data *nan, struct wpabuf *buf)\n \twpabuf_put_u8(buf, pairing_and_npk_caching);\n }\n \n+/*\n+ * nan_add_nira_attr - Add NIRA (NAN Identity Resolution Attribute) to a buffer\n+ *\n+ * @buf: Buffer to append the NIRA attribute to\n+ * @nira_tag: Pointer to NIRA tag data (NAN_NIRA_TAG_LEN bytes)\n+ * @nira_nonce: Pointer to NIRA nonce data (NAN_NIRA_NONCE_LEN bytes)\n+ *\n+ * This function constructs and appends a NAN Identity Resolution Attribute\n+ * (NIRA) to the provided buffer.\n+ *\n+ * Returns: 0 on success, -1 if there is insufficient space in the buffer\n+ */\n+int nan_add_nira_attr(struct wpabuf *buf, const u8 *nira_tag,\n+\t\t const u8 *nira_nonce)\n+{\n+\tu16 attr_len = 1 + NAN_NIRA_NONCE_LEN + NAN_NIRA_TAG_LEN;\n+\n+\tif (wpabuf_tailroom(buf) <\n+\t (unsigned int)(NAN_ATTR_HDR_LEN + attr_len)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Not enough space to add NIRA attribute\");\n+\t\treturn -1;\n+\t}\n+\n+\twpabuf_put_u8(buf, NAN_ATTR_NIRA);\n+\twpabuf_put_le16(buf, attr_len);\n+\twpabuf_put_u8(buf, NAN_NIRA_CIPHER_VER_128);\n+\twpabuf_put_data(buf, nira_nonce, NAN_NIRA_NONCE_LEN);\n+\twpabuf_put_data(buf, nira_tag, NAN_NIRA_TAG_LEN);\n+\n+\treturn 0;\n+}\n+\n \n /**\n * nan_chan_to_chan_idx_map - Convert an op_class and chan to channel bitmap\n", "prefixes": [ "13/92" ] }