Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226389/?format=api
{ "id": 2226389, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226389/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-43-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-43-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:23:33", "name": "[42/92] NAN: Add NIRA to PASN frames for pairing verification", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "459a8687579b183bbe4814656cffc9c579a217a6", "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-43-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/2226389/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226389/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=kq4JiJca;\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=B2JqKu00;\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 4g0z5l3t4Pz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:28:11 +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 1wFWg3-0000000A6EA-0fQD;\n\tWed, 22 Apr 2026 12:27:35 +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 1wFWec-0000000A34C-07nB\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:26:22 +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:25:43 -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:25:42 -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=IF531olztQOQlTC1G+iUKe0h8Jmk41pIZxNbzSZ0X3k=; b=kq4JiJcayAqYTJ\n\tnLDT6oXW+mL+YZS5mV/WeCxitI5Qd82eS0Bt6vYH2P5hvBcrY+Nl+u7/3aiougULYXRc1hIDzUsBe\n\t5X2Bwgy2bdkhZ8ex0fkDlpnOb6t3zjqi0SLInNQvygS5JLs/l+K0OQ9Sd3bt8dBD97Jx7inasE9Qp\n\tLFeGH1+tWgZmdDA3Uri7ESO4DWUziK2lKPOXoBdhm6Hfgesi8P2ccHLOi+zx85moacvCdRKi4RRps\n\tUfFQppMhiNX99f30ZEyMCGmZRGhQNnEZC7IlinuzhdTiG3vwA5rG+GIzGx87O0cJE551djXCWKulp\n\tSUVCfmBef4r8aTvj1Hjg==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860766; x=1808396766;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=DRFbp+7EjkcuExsxjvfHSOkv/mdd5AaDryuqDDielW8=;\n b=B2JqKu00rN6QRpMoIWo53vB6jkml5+vWmecI43rsQCfL5MCcRISDizpJ\n Kil5bcNdAnoO1IfX5tMqpyFct78D/as82BuijIzEZSp0sxOH36J3+RQdr\n WUkCGXhE1xt+H4FoVGl3hnOBbKA/G52pwkx1T4LIUiF7u1DLJfkX/iT/G\n RilrauRfya/Ke3sCXXPEcWIsqAIl0Sg5maFEiJERjbLGoyX8dqtLC/j0K\n CPx+dse/TlEWxTwDyHn09r59MeNlPuVZ3Jokv8igV5pS+Vkk61O7QHLi+\n f87vshJEUMDRPrnxIuuUsyJ4ArQlyCy+1oVNlzX/2mk8bhHGgik0wcQnl\n w==;" ], "X-CSE-ConnectionGUID": [ "1USDzAKmSECgz6NF/W6uEQ==", "S6/lIGDRRfqrsPrl5ZPfjw==" ], "X-CSE-MsgGUID": [ "yVyHo2qfT/CPMc4JgcFbDw==", "KXC7qFetS2KH9bBsKXhuKg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687358\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687358\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445031\"" ], "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 42/92] NAN: Add NIRA to PASN frames for pairing verification", "Date": "Wed, 22 Apr 2026 15:23:33 +0300", "Message-ID": "<20260422122424.43776-43-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_052606_164210_4CA28B6D ", "X-CRM114-Status": "GOOD ( 13.89 )", "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> In pairing\n verification\n flow, the PASN frames should contain the Nan Identity Resolution attribute\n (NIRA). Add it to the NAN IE in the PASN first and second frames.\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\nIn pairing verification flow, the PASN frames should contain the\nNan Identity Resolution attribute (NIRA). Add it to the NAN IE in\nthe PASN first and second frames.\n\nSigned-off-by: Avraham Stern <avraham.stern@intel.com>\n---\n src/nan/nan_pairing.c | 27 ++++++++++++++++++++++-----\n 1 file changed, 22 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/nan/nan_pairing.c b/src/nan/nan_pairing.c\nindex 4f88ba37e3..0e6c8c8c72 100644\n--- a/src/nan/nan_pairing.c\n+++ b/src/nan/nan_pairing.c\n@@ -411,6 +411,7 @@ fail:\n * @peer: Pointer to NAN peer structure\n * @extra_ies: Buffer to append the NAN IE to\n * @publish_id: Publish ID to use in the CSIA\n+ * @auth_mode: Pairing authentication mode\n *\n * This function adds a NAN IE containing the NAN attributes that shall be\n * included in the first and second PASN frames for NAN pairing.\n@@ -423,7 +424,7 @@ fail:\n static void nan_pairing_prepare_pasn_elems(struct nan_data *nan_data,\n \t\t\t\t\t struct nan_peer *peer,\n \t\t\t\t\t struct wpabuf *extra_ies,\n-\t\t\t\t\t int publish_id)\n+\t\t\t\t\t int publish_id, int auth_mode)\n {\n \tu8 *len_ptr;\n \tstruct nan_cipher_suite cs;\n@@ -437,7 +438,6 @@ static void nan_pairing_prepare_pasn_elems(struct nan_data *nan_data,\n \t/* OUI + OUI Type */\n \twpabuf_put_be32(extra_ies, NAN_IE_VENDOR_TYPE);\n \n-\tnan_add_dev_capa_ext_attr(nan_data, extra_ies);\n \tif (peer->pairing.pasn->cipher == WPA_CIPHER_GCMP_256)\n \t\tcs.csid = NAN_CS_PK_PASN_256;\n \telse\n@@ -451,8 +451,24 @@ static void nan_pairing_prepare_pasn_elems(struct nan_data *nan_data,\n \t */\n \tnan_add_csia(extra_ies, 0, 1, &cs);\n \n-\tif (peer->bootstrap.npba)\n-\t\twpabuf_put_buf(extra_ies, peer->bootstrap.npba);\n+\tif (auth_mode == NAN_PASN_AUTH_MODE_SAE ||\n+\t auth_mode == NAN_PASN_AUTH_MODE_PASN) {\n+\t\tnan_add_dev_capa_ext_attr(nan_data, extra_ies);\n+\t\tif (peer->bootstrap.npba)\n+\t\t\twpabuf_put_buf(extra_ies, peer->bootstrap.npba);\n+\t} else {\n+\t\tu8 *npkid = peer->pairing.pasn->custom_pmkid;\n+\n+\t\t/*\n+\t\t * Add NIRA with the same nonce and tag as in the NPKID.\n+\t\t * NPKID is: NONCE || TAG.\n+\t\t */\n+\t\tif (nan_add_nira_attr(extra_ies, &npkid[NAN_NIRA_NONCE_LEN],\n+\t\t\t\t npkid)) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Failed to add NIRA attribute\");\n+\t\t}\n+\t}\n \n \t*len_ptr = wpabuf_len(extra_ies) - initial_len - 2;\n }\n@@ -519,7 +535,8 @@ int nan_pairing_initiate_pasn_auth(struct nan_data *nan_data, const u8 *addr,\n \t/* TODO: Add support for NAN IE fragmentation if it's larger than 255\n \t * octets, as defined in Wi-Fi Aware Specification v4.0 Section 9.1\n \t */\n-\tnan_pairing_prepare_pasn_elems(nan_data, peer, extra_ies, handle);\n+\tnan_pairing_prepare_pasn_elems(nan_data, peer, extra_ies, handle,\n+\t\t\t\t auth_mode);\n \tpasn_set_extra_ies(pasn, wpabuf_head_u8(extra_ies),\n \t\t\t wpabuf_len(extra_ies));\n \twpabuf_free(extra_ies);\n", "prefixes": [ "42/92" ] }