Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226437/?format=api
{ "id": 2226437, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226437/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-92-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-92-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:24:22", "name": "[91/92] NAN: Use pairing CSID in NDP establishment", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2d8c9b51a282593813abbb1af53ec80bc26b7b2c", "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-92-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/2226437/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226437/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=AyoVuzTg;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=desiato.20200630 header.b=TlnVY9ik;\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=BMQNAYWT;\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 4g0zBZ1wrMz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:32:22 +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 1wFWk9-0000000AC29-08OT;\n\tWed, 22 Apr 2026 12:31:49 +0000", "from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWg8-0000000A6Nf-3R0x\n\tfor hostap@bombadil.infradead.org;\n\tWed, 22 Apr 2026 12:27:41 +0000", "from mgamail.intel.com ([192.198.163.17])\n\tby desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWg3-0000000BKjs-03uS\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:27:38 +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:27:02 -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:27:02 -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=JKXXcbOZWDMQnUMdcEKo6ww2ULpjCn0VAOVK3UiyoXI=; b=AyoVuzTgsnd66H\n\tC0AkghgRf9KT5ZPp05nBwYlFH2GOXAF4/o4oN4a1zFneGnZUnqQ/FqXIuBK8aGLTkkFkI6nC+oiDW\n\tw8X/LaSq+QDXnc0xlMnhqoyFGGUMM4QY2gdDfjzrUsajCz8AywcbeCQYq1a9UCKBy3kipxLmjEhFb\n\tB7Jo8SFKqi6gE3hF9hsAVxtDdg3P1T+kGL6cDyQl4smup/2nOarwfo17D+W8OfXYgRMw7786CPOrT\n\tMprgqf+v0GL5226IiviMk7wAnevW5EbDwONBJVzD5ipPZ6F3blttSU9O9/ijKWJCa4+8Bm2rS5y5B\n\tPCboD9Q13N6+mDnW6AjA==;", "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version\n\t:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=6pj6zDkZY6byLvLGxpRyIRihAPzFmkOpv4JGnFpYXGs=; b=TlnVY9ikW5phfiy7pKpskZ4Sc0\n\tbbotwUtV03yQLIBqBZ7NpV7GVnnkPrF8QLBkdlPdX6SDMXpCl8vaXSASryS/pp40JdCIxpsYpptRZ\n\t382pYGrA/UWWGg+g2HIXZsDhEYwsTEnscDP0HPxAYpBn5LoekivDyvFSdYqcNyyS9evI1S2BRWEME\n\tIB/beyO+xaADx0A4Yzo4N+YuVR8uvxOZKgiShcJ9G7ZmF1Ks6h9JyAXdxxojPk/x6z0yA/XxVGmx9\n\t+d3Lif5zShCigfyHrvlv43a4KJLrduXNASvdEa/vG0uDPckWEfoXlREN9mjHR5ZAxKy/8adPVW+sq\n\t8CU1gTtg==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860855; x=1808396855;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=6PIMMlNBZVnEP8Z1slCLpkdmID4F60RtWrcuiA2fjzQ=;\n b=BMQNAYWTrorA4QfYAy7pw5EhVPNk3JkBS+EirvJ/QDUW/liTIRFjhUpk\n W9BQPXNxGkoBGYEft/6T+zv/Rh5GY9j28pHrCynbF7Ar2UYNnF9BftaH9\n Dy/7h6YMVF7CvnYKfPxE5c0yiEKg99xSKHKMxoGzD6VV15GCDuXb8AGZV\n VItJm+IBLZOESNP2W8hwVd2JF5WfVWz3GbY3MgrjajkTfJiLDNQ8u3jLX\n ugnnuN6VP2ZmVatUoWJQhbVAMLIjpEbv2Q6NlRZC1NWJ7buctR4sXsEnp\n lJR99LR+czUEusuR0+jABQcH9wdmFZqiS6/wiNU14K3B+ZA4zRjbYr7lB\n A==;" ], "X-CSE-ConnectionGUID": [ "X64eeEY5S4K71Acpy8XLUg==", "SJVZpXKLSmmi5syDQm5HVQ==" ], "X-CSE-MsgGUID": [ "WdQkMtofQ0OOIM10DtgXUg==", "9okUPrdBQZKw+BImcozUaQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687643\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687643\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445376\"" ], "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\tAndrei Otcheretianski <andrei.otcheretianski@intel.com>", "Subject": "[PATCH 91/92] NAN: Use pairing CSID in NDP establishment", "Date": "Wed, 22 Apr 2026 15:24:22 +0300", "Message-ID": "<20260422122424.43776-92-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_132735_393453_F3680860 ", "X-CRM114-Status": "GOOD ( 14.42 )", "X-Spam-Score": "-2.5 (--)", "X-Spam-Report": "Spam detection software,\n running on the system \"desiato.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: NDP establihment between paired peers should use the same\n CSID as in the original pairing. Store pairing CSID and reuse it in NDP\n setup.\n In addition, make sure PASN cipher suites are not used if the d [...]\n Content analysis details: (-2.5 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_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\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 Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\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": "NDP establihment between paired peers should use the same CSID as in\nthe original pairing.\nStore pairing CSID and reuse it in NDP setup. In addition, make sure\nPASN cipher suites are not used if the devices are not paired.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n src/common/nan_defs.h | 2 ++\n src/nan/nan.c | 17 +++++++++++++++++\n src/nan/nan_i.h | 2 ++\n src/nan/nan_pairing.c | 13 +++++++------\n 4 files changed, 28 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/common/nan_defs.h b/src/common/nan_defs.h\nindex e9b6f21be6..d4fb4ef875 100644\n--- a/src/common/nan_defs.h\n+++ b/src/common/nan_defs.h\n@@ -503,6 +503,8 @@ enum nan_cipher_suite_id {\n \t((csid) == NAN_CS_SK_GCM_256 || (csid) == NAN_CS_PK_PASN_256)\n #define NAN_CS_IS_VALID_NDP(csid) \\\n \t(NAN_CS_IS_128(csid) || NAN_CS_IS_256(csid))\n+#define NAN_CS_IS_PASN(csid) \\\n+\t((csid) == NAN_CS_PK_PASN_128 || (csid) == NAN_CS_PK_PASN_256)\n \n struct nan_cipher_suite {\n \tu8 csid; /* Cipher Suite ID */\ndiff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 38006f349f..91d63e0a77 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1928,6 +1928,23 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\n \t\treturn -1;\n \t}\n \n+\t/*\n+\t * If the peer is paired, select the CSID based on the pairing\n+\t * information (and ignore the CSID in the parameters, if any).\n+\t * Otherwise, make sure that PASN CSIDs are not used.\n+\t */\n+\tif (peer->pairing.flags & NAN_PAIRING_FLAG_PAIRED) {\n+\t\tparams->sec.csid = peer->pairing.pairing_csid;\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Paired peer, selected CSID=%d from pairing\",\n+\t\t\t params->sec.csid);\n+\t} else if (NAN_CS_IS_PASN(params->sec.csid)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: PASN CSID %d requires peer to be paired\",\n+\t\t\t params->sec.csid);\n+\t\treturn -1;\n+\t}\n+\n \tswitch (params->type) {\n \tcase NAN_NDP_ACTION_REQ:\n \t\tparams->ndp_id.id = nan_get_next_ndp_id(nan);\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex c2257f56fb..fe9a5fba07 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -489,6 +489,7 @@ enum nan_pairing_role {\n * @tag: Tag from peer's NIRA attribute\n * @flags: Bitmap of pairing flags. See NAN_PAIRING_FLAG_*\n * @pending_auth1: Pending PASN Authentication frame 1 to be processed\n+ * @pairing_csid: Cipher suite ID used for the pairing\n */\n struct nan_pairing_peer_data {\n \tstruct nan_pairing_cfg pairing_cfg;\n@@ -501,6 +502,7 @@ struct nan_pairing_peer_data {\n \tu8 tag[NAN_NIRA_TAG_LEN];\n \tu32 flags;\n \tstruct wpabuf *pending_auth1;\n+\tenum nan_cipher_suite_id pairing_csid;\n };\n \n /**\ndiff --git a/src/nan/nan_pairing.c b/src/nan/nan_pairing.c\nindex eff743125e..163b6b9619 100644\n--- a/src/nan/nan_pairing.c\n+++ b/src/nan/nan_pairing.c\n@@ -607,12 +607,14 @@ static void nan_pairing_done(struct nan_data *nan_data, struct nan_peer *peer)\n \tu8 npk[NAN_NPK_LEN];\n \tstruct pasn_data *pasn = peer->pairing.pasn;\n \tint cipher = pasn_get_cipher(pasn);\n-\tenum nan_cipher_suite_id csid;\n \tu8 *initiator_nmi, *responder_nmi;\n \tint ret;\n \n \tpeer->pairing.flags |= NAN_PAIRING_FLAG_PAIRED;\n \n+\tpeer->pairing.pairing_csid = cipher == WPA_CIPHER_GCMP_256 ?\n+\t\t\t\t NAN_CS_PK_PASN_256 : NAN_CS_PK_PASN_128;\n+\n \tif (!nan_data->cfg->pairing_cfg.npk_caching ||\n \t !peer->pairing.pairing_cfg.npk_caching ||\n \t peer->pairing.flags & NAN_PAIRING_FLAG_NPK_VERIFICATION)\n@@ -628,10 +630,8 @@ static void nan_pairing_done(struct nan_data *nan_data, struct nan_peer *peer)\n \t\tresponder_nmi = nan_data->cfg->nmi_addr;\n \t}\n \n-\tcsid = cipher == WPA_CIPHER_GCMP_256 ? NAN_CS_PK_PASN_256 :\n-\t\t\t\t\t NAN_CS_PK_PASN_128;\n-\n-\tret = nan_crypto_derive_kek(pasn->ptk.kdk, pasn->ptk.kdk_len, csid,\n+\tret = nan_crypto_derive_kek(pasn->ptk.kdk, pasn->ptk.kdk_len,\n+\t\t\t\t peer->pairing.pairing_csid,\n \t\t\t\t initiator_nmi, responder_nmi,\n \t\t\t\t &pasn->ptk);\n \tif (ret) {\n@@ -650,7 +650,8 @@ static void nan_pairing_done(struct nan_data *nan_data, struct nan_peer *peer)\n \n \twpa_printf(MSG_DEBUG, \"NAN: Pairing: Derive NPK after PASN pairing\");\n \n-\tret = nan_crypto_derive_npk(pasn->ptk.kdk, pasn->ptk.kdk_len, csid,\n+\tret = nan_crypto_derive_npk(pasn->ptk.kdk, pasn->ptk.kdk_len,\n+\t\t\t\t peer->pairing.pairing_csid,\n \t\t\t\t initiator_nmi, responder_nmi, npk,\n \t\t\t\t sizeof(npk));\n \tif (ret) {\n", "prefixes": [ "91/92" ] }