{"id":2229843,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229843/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-38-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-38-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:05:38","name":"[37/97] NAN: Add the GTK KDE to key data field when GTK is required","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"99fcc132227c3abbcd94fad7c4921ca7017d3233","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-38-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/2229843/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229843/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=gyxWTdXz;\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=NH8lt3u+;\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 4g4s573SFjz1xrS\n\tfor ; Wed, 29 Apr 2026 06:11:07 +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 1wHolM-00000002GLb-127Z;\n\tTue, 28 Apr 2026 20:10:34 +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 1wHojL-00000002Cfh-3vlR\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:08:32 +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:12 -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:10 -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=oxrk1H1jDBuPxr9lYzJ/pjQkD+NEzsC97c5xyJRLyps=; b=gyxWTdXzvrX4S4\n\tA5/cRAiXuK9lXeVgGd5E53gokXqtaqfwMAvEt3QEtcdT+05uxuDGgGT1wTLUyTyxcOz/eJkjTuayt\n\txxbzlnyRY0aXkprn47YM7U0p75AReKwonDKVSgJthuZfC1XAyp7XmC3OZJlb/fwOrpy54YLChdQ8K\n\tGvTfI9XgwT7wMfLprUXvcCj8G3ktMDNw0n5mxWhinDF7QsbhxJCBUzLwSvINjGhV1R8EILVkDWPDW\n\tSAuHPU44I2znoXNZLh5L7wefe+MqHIYHYraE2KyIFGedVWI5g3VARjf5oo621e81Uei1JRJ6VDQma\n\tLW9gaIDLZR3QXKoRX/0w==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406907; x=1808942907;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=oOfbmVdTMqyCUw/On4DIVM0hJA1ZLv5jqnSnWHWNa0Y=;\n b=NH8lt3u+YgcaFIMxJKN/kB3H4LNGBkslOb6uFPLvgZ3JgmgrVSTJ8Z6j\n /BdIev1VkqxUNrGHMgBlCsNLWxwGwcpuIlk+OLO1NpfrMt5sX/xPAcfbu\n RnDQ2t5kdFYdcvrgzuv6mllxFvVXT40xKiqK+XKYgKme730JeD+jGJkdK\n v3uFYzzbR5Gobq2BdV7TaNDnfZoc8b7IoU0GjBfm+1wM1WKsI5v3NLYDo\n YEoKoe4i7U/5iFnHeOLWU2oI99r6ikOQAGVpPwlO5/3kd3AWnByUDUZ4M\n k2YPZCbtuN8DO3GbOn6CJfxxtPJi25+KgvxwqDlXp0s/iHuI9BPFrQRku\n w==;"],"X-CSE-ConnectionGUID":["+MoPkmwWR8+t4UXEb/XQSw==","BoAmk8oqQ0a+Z2UD+vLSiQ=="],"X-CSE-MsgGUID":["gfy+U13dRH+Qy9pyO89w+g==","4XTpUGMfRoaEbvEpK21+hg=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519401\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519401\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610322\""],"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 37/97] NAN: Add the GTK KDE to key data field when GTK is\n required","Date":"Tue, 28 Apr 2026 23:05:38 +0300","Message-ID":"<20260428200639.40243-38-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_130828_198710_D96D6F67 ","X-CRM114-Status":"GOOD ( 17.19 )","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 When the NDP\n requires a GTK, add the GTK KDE to the key data field and set the key RSC\n field to the GTK RSC. Signed-off-by: Avraham Stern\n \n --- src/common/wpa_common.h | 7 ++++++ src/nan/nan_sec.c | 54\n ++++++++++++++++++++++++++++++++++++++---\n 2 files changed, 58 insertions(+), 3 dele [...]\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\nWhen the NDP requires a GTK, add the GTK KDE to the key data field\nand set the key RSC field to the GTK RSC.\n\nSigned-off-by: Avraham Stern \n---\n src/common/wpa_common.h | 7 ++++++\n src/nan/nan_sec.c | 54 ++++++++++++++++++++++++++++++++++++++---\n 2 files changed, 58 insertions(+), 3 deletions(-)","diff":"diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h\nindex 71df9db86e..98a1c7213a 100644\n--- a/src/common/wpa_common.h\n+++ b/src/common/wpa_common.h\n@@ -359,6 +359,13 @@ struct rsn_error_kde {\n \tbe16 error_type;\n } STRUCT_PACKED;\n \n+#define WPA_GTK_KDE_PREFIX_LEN 2\n+struct wpa_gtk_kde {\n+\tu8 keyid;\n+\tu8 reserved;\n+\tu8 gtk[WPA_GTK_MAX_LEN];\n+} STRUCT_PACKED;\n+\n #define WPA_IGTK_KDE_PREFIX_LEN (2 + RSN_PN_LEN)\n struct wpa_igtk_kde {\n \tu8 keyid[2];\ndiff --git a/src/nan/nan_sec.c b/src/nan/nan_sec.c\nindex 964b6a01a3..68310c94f1 100644\n--- a/src/nan/nan_sec.c\n+++ b/src/nan/nan_sec.c\n@@ -966,7 +966,8 @@ static int nan_sec_igtk_kde(struct nan_data *nan, struct wpabuf *buf)\n \n #define NAN_KDES_MAX_LEN \\\n \t(KDE_HDR_LEN + sizeof(struct wpa_igtk_kde) + KDE_HDR_LEN + \\\n-\t sizeof(struct wpa_bigtk_kde))\n+\t sizeof(struct wpa_bigtk_kde) + KDE_HDR_LEN + \\\n+\t sizeof(struct wpa_gtk_kde))\n \n static int nan_sec_bigtk_kde(struct nan_data *nan, struct nan_ndp_sec *ndp_sec,\n \t\t\t struct wpabuf *buf)\n@@ -1002,6 +1003,30 @@ static int nan_sec_bigtk_kde(struct nan_data *nan, struct nan_ndp_sec *ndp_sec,\n }\n \n \n+static int nan_sec_gtk_kde(struct nan_data *nan, struct wpabuf *buf,\n+\t\t\t struct nan_ndp_sec *ndp_sec)\n+{\n+\tif (!ndp_sec->local_gtk.gtk.gtk_len)\n+\t\treturn 0;\n+\n+\tif (ndp_sec->local_gtk.id > 3) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Invalid GTK Key ID %u\",\n+\t\t\t ndp_sec->local_gtk.id);\n+\t\treturn -1;\n+\t}\n+\n+\tnan_add_kde_hdr(buf, RSN_KEY_DATA_GROUPKEY,\n+\t\t\tWPA_GTK_KDE_PREFIX_LEN +\n+\t\t\t\tndp_sec->local_gtk.gtk.gtk_len);\n+\twpabuf_put_u8(buf, ndp_sec->local_gtk.id);\n+\twpabuf_put_u8(buf, 0);\n+\twpabuf_put_data(buf, ndp_sec->local_gtk.gtk.gtk,\n+\t\t\tndp_sec->local_gtk.gtk.gtk_len);\n+\n+\treturn 0;\n+}\n+\n+\n static bool nan_sec_igtk_supported(struct nan_ndp_sec *ndp_sec)\n {\n \treturn ((ndp_sec->i_capab & NAN_CS_INFO_CAPA_GTK_SUPP_MASK) >>\n@@ -1021,9 +1046,10 @@ static int nan_sec_add_kdes(struct nan_data *nan,\n \tstruct wpabuf *enc_kde;\n \tint ret = -1;\n \n-\tif (!nan_sec_igtk_supported(ndp_sec)) {\n+\tif (!nan_sec_igtk_supported(ndp_sec) &&\n+\t ndp_sec->local_gtk.gtk.gtk_len == 0) {\n \t\twpa_printf(MSG_DEBUG,\n-\t\t\t \"NAN: IGTK not supported for this NDP\");\n+\t\t\t \"NAN: GTK/IGTK not supported for this NDP\");\n \t\treturn 0;\n \t}\n \n@@ -1046,6 +1072,9 @@ static int nan_sec_add_kdes(struct nan_data *nan,\n \tif (nan_sec_bigtk_kde(nan, ndp_sec, kde_buf) < 0)\n \t\tgoto fail;\n \n+\tif (nan_sec_gtk_kde(nan, kde_buf, ndp_sec) < 0)\n+\t\tgoto fail;\n+\n \tenc_kde = nan_crypto_encrypt_key_data(kde_buf, ndp_sec->ptk.kek,\n \t\t\t\t\t ndp_sec->ptk.kek_len);\n \tif (!enc_kde) {\n@@ -1121,6 +1150,25 @@ static int nan_sec_add_key_attrs(struct nan_data *nan, struct nan_peer *peer,\n \t\treturn -1;\n \t}\n \n+\t/* When GTK is present, the key RSC field is set to the GTK RSC */\n+\tif (ndp_sec->local_gtk.gtk.gtk_len) {\n+\t\tu8 *local_ndi;\n+\t\tstruct nan_ndp *pndp = peer->ndp_setup.ndp;\n+\n+\t\tif (pndp->initiator)\n+\t\t\tlocal_ndi = pndp->init_ndi;\n+\t\telse\n+\t\t\tlocal_ndi = pndp->resp_ndi;\n+\n+\t\tif (nan->cfg->get_seqnum(nan->cfg->cb_ctx,\n+\t\t\t\t\t ndp_sec->local_gtk.id, key->key_rsc,\n+\t\t\t\t\t local_ndi) < 0) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: SEC: Failed to get GTK seqnum\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n \tinfo = WPA_KEY_INFO_TYPE_AKM_DEFINED | WPA_KEY_INFO_KEY_TYPE |\n \t WPA_KEY_INFO_MIC | WPA_KEY_INFO_INSTALL | WPA_KEY_INFO_SECURE;\n \tif (is_ack)\n","prefixes":["37/97"]}