{"id":2229842,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229842/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-37-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.1/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":""},"msgid":"<20260428200639.40243-37-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:05:37","name":"[36/97] NAN: Modify get_seqnum() to support NDI group keys","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b96e397887b0913bae64d140b2022304d3f8ce26","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.1/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-37-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501927,"url":"http://patchwork.ozlabs.org/api/1.1/series/501927/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/list/?series=501927","date":"2026-04-28T20:05:05","name":"NAN: Group keys support, schedule update and more","version":1,"mbox":"http://patchwork.ozlabs.org/series/501927/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229842/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229842/checks/","tags":{},"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=iCsButvu;\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=bs6AeHeV;\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 4g4s530GDGz1xrS\n\tfor ; Wed, 29 Apr 2026 06:11:03 +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 1wHolI-00000002GGG-39Eb;\n\tTue, 28 Apr 2026 20:10:28 +0000","from mgamail.intel.com ([198.175.65.16])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHojH-00000002CcZ-2J4W\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:08:28 +0000","from fmviesa001.fm.intel.com ([10.60.135.141])\n by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:11 -0700","from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:09 -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=op1L2YZwWIkp62LBy5Cfu72UnRmTqI//gZGaEE61DCQ=; b=iCsButvuY71Lgw\n\tBrrghZIHiZE3EWIIu/rxwGATUZzlQUsT4ojn4PkYUBxhjNQjU122DvPaZwikGxP0ZiNRLr8jJdOKa\n\tBH5EOh+xrbCOdLrBiT+4Iw1+fbREU0ONwqEXl/qBCGQfgJi47yfV6JT/Xio7OEmFBSHsWBYcYlMIO\n\tsnLmbPVOQHxQABNylIFIxnpdljm5BgSlkTVSVAV/xKNeC/UwPmk4qeKOQxf51LzCavGIUr+yjIKUJ\n\trorfp4amxh7UxL7YCWeiA2pdVVoLZEhuqUJvY2VhY4E134s05UW8hRF4e2HDcCkHpDXuVw3z3tiDc\n\tt3bfLY8HoaKIhA4eteqw==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406904; x=1808942904;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=WiHRQkRwvWCDQIEJOeaXANM345QybrNXMVqPZ+pOMwQ=;\n b=bs6AeHeVo2hUUPSamvFRLUj8zUnLyUJnEfNIZH5Ib8Y4RDYXPBE2nD7+\n bxRMXXVlI1ofCsaduwdYHR/nJ9Ih6e4yGsiE5HZmWYtAyWdca/L1f0TCx\n Izu74ZEJ2PF/47ga0lS+NL6UKEwMqXXfOOwAlGNaQuscUwQrj7pbSpaTX\n DJNuqH6njkb/HpWLWJjYR2yQS8u1CjwA44rr3JwOYSTMOqTI45Ak855Ua\n gXhpRuimSBGHsRT4j8Z9eXXWmrv7JrcnZDnm4mJtWaAPqWc1mUGbMkjdK\n NesoGaKwnHH2Lmxtus8/wbHjSg1A29gkW9TatkENRVRuW/0vxQhkmZdZd\n A==;"],"X-CSE-ConnectionGUID":["boP+xXpATfeVb8XNyH7xQw==","sCqczhoBRGacRmrfkjm7/Q=="],"X-CSE-MsgGUID":["FJZMNpR3Sk6w7SkrqyZHlA==","nl3EcN8XQMivl+SRAIrBsA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519398\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519398\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610299\""],"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 36/97] NAN: Modify get_seqnum() to support NDI group keys","Date":"Tue, 28 Apr 2026 23:05:37 +0300","Message-ID":"<20260428200639.40243-37-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260428200639.40243-1-andrei.otcheretianski@intel.com>","References":"<20260428200639.40243-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-20260428_130823_887923_99613091 ","X-CRM114-Status":"GOOD ( 15.65 )","X-Spam-Score":"-4.5 (----)","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 Modify the\n get_seqnum()\n callback to support the NDI group keys. Add a NDI address parameter to the\n callback. When the NDI address is set,\n the sequence number should be queried\n from the interface corre [...]\n Content analysis details: (-4.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 [198.175.65.16 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_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 -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.1 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\nModify the get_seqnum() callback to support the NDI group keys.\nAdd a NDI address parameter to the callback. When the NDI address\nis set, the sequence number should be queried from the interface\ncorresponding to the specified NDI address.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.h | 4 +++-\n src/nan/nan_sec.c | 6 ++++--\n wpa_supplicant/nan_supplicant.c | 18 +++++++++++++++++-\n 3 files changed, 24 insertions(+), 4 deletions(-)","diff":"diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex dbcc195857..294d715bf5 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -741,9 +741,11 @@ struct nan_config {\n \t * @ctx: Callback context from cb_ctx\n \t * @key_idx: Key index\n \t * @seq: Buffer for returning the latest used PN value\n+\t * @ndi_addr: For NDI group keys, the NDI MAC address; %NULL for\n+\t *\tNMI group keys\n \t * Returns: 0 on success, -1 on failure\n \t */\n-\tint (*get_seqnum)(void *ctx, int key_idx, u8 *seq);\n+\tint (*get_seqnum)(void *ctx, int key_idx, u8 *seq, u8 *ndi_addr);\n };\n \n struct nan_data * nan_init(const struct nan_config *cfg);\ndiff --git a/src/nan/nan_sec.c b/src/nan/nan_sec.c\nindex 7c509b672c..964b6a01a3 100644\n--- a/src/nan/nan_sec.c\n+++ b/src/nan/nan_sec.c\n@@ -950,7 +950,8 @@ static int nan_sec_igtk_kde(struct nan_data *nan, struct wpabuf *buf)\n {\n \tu8 tsc[RSN_PN_LEN];\n \n-\tif (nan->cfg->get_seqnum(nan->cfg->cb_ctx, nan->igtk_id, tsc) < 0) {\n+\tif (nan->cfg->get_seqnum(nan->cfg->cb_ctx, nan->igtk_id, tsc,\n+\t\t\t\t NULL) < 0) {\n \t\twpa_printf(MSG_DEBUG, \"NAN: Failed to get IGTK seqnum\");\n \t\treturn -1;\n \t}\n@@ -986,7 +987,8 @@ static int nan_sec_bigtk_kde(struct nan_data *nan, struct nan_ndp_sec *ndp_sec,\n \t\treturn 0;\n \t}\n \n-\tif (nan->cfg->get_seqnum(nan->cfg->cb_ctx, nan->bigtk_id, tsc) < 0) {\n+\tif (nan->cfg->get_seqnum(nan->cfg->cb_ctx, nan->bigtk_id, tsc,\n+\t\t\t\t NULL) < 0) {\n \t\twpa_printf(MSG_DEBUG, \"NAN: Failed to get BIGTK seqnum\");\n \t\treturn -1;\n \t}\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex db876fc098..aa29bfc021 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -928,10 +928,26 @@ static int wpas_nan_set_group_key_cb(void *ctx, enum wpa_alg alg,\n }\n \n \n-static int wpas_nan_get_seqnum_cb(void *ctx, int key_idx, u8 *seq)\n+static int wpas_nan_get_seqnum_cb(void *ctx, int key_idx, u8 *seq, u8 *ndi_addr)\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n \n+\tif (ndi_addr) {\n+\t\twpa_s = wpas_nan_get_ndi_iface(wpa_s, ndi_addr);\n+\t\tif (!wpa_s) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: No NDI interface found for addr \"\n+\t\t\t\t MACSTR, MAC2STR(ndi_addr));\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* If the NDI GTK is not installed yet, RSC is 0 */\n+\t\tif (!wpa_s->ndi_gtk.id) {\n+\t\t\tos_memset(seq, 0, WPA_KEY_RSC_LEN);\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n \treturn wpa_drv_get_seqnum(wpa_s, NULL, key_idx, seq);\n }\n \n","prefixes":["36/97"]}