Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226402/?format=api
{ "id": 2226402, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226402/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-56-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-56-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:23:46", "name": "[55/92] NAN: Add supported cipher suite list to the discovery result callback", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "579ab2e4940a5c06f51a1f28b149acc16cc7f6e1", "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-56-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/2226402/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226402/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=u6xxnWet;\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=SERutiKH;\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 4g0z6x3Hlfz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:29:13 +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 1wFWh9-0000000A7mg-0ozp;\n\tWed, 22 Apr 2026 12:28:43 +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 1wFWfF-0000000A3P1-0tla\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:26:53 +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:26:04 -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:26:03 -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=BWiiBQWQekCsrPHfBRwCZLbViO7mD771PQdNXlDN1M8=; b=u6xxnWetw0BRad\n\tEtpna7rimtXPVOuBRhGip8mVUrZVp5TaZ8JDnBLwHs/8q8JpDmHiO3YR3R3Q0SBIy9Fz9fuZNoD9Z\n\tXc8p2V1m10sY1L1r/gn+uKcAndN7dONZIcaAYhLMRgsjdyejU/Tvqk97duyUPe8FpfPOS9190p+sD\n\thKo7CUVH0s6vmjTAq6FbrFQCvaHrzYFgJe4tzIrbDaqR8sl+cc7Gdq8VKWpByWw1SvPngW/QzbHJV\n\tmS7qc6tLlMmIGuHkccIVVyfQxnmU9aNRueSPOYHVw82AYii8qZCMHjuVjhAmPs2/4GsDNM7Fd4asU\n\t94NwOA3OxCPnATOtp1bA==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860805; x=1808396805;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=Ch1M6oOz1CHfC7GnzHYASRorffAiouVTJBFknCCGDSI=;\n b=SERutiKH5UjAYvCAazBdzUNw7FNQRmaOZHb88nb09DlDMuZ+nuAGmEKb\n Q75xB++JjzSyNpZfYiejMMot9nScy22NXWswj28USTdTVQwrAu3yU4ysm\n g+VvGeiqjoByhVvyQUJdTRUixbvnLRc7EGFFhASSAyOtduVvKEDE9jByq\n zvhu9VStADHEBhRMIITxLYxSKcEU2QEQ2wrSRFlzvlp0aLGkPEbi6LGlr\n qfcMvwu+mssPGR5yzvOBWhjy0Qu+nJW1q+v5F44KihZhcUtSZA113ydA3\n jcxksEPlysaOUTvDRtuxE+aDzWqVfH43l1AbNj3SNefrD3e1QyhiAB3K4\n w==;" ], "X-CSE-ConnectionGUID": [ "fEDwUrBiQbGWxvjEmJNlow==", "mIaQeh/+THWHVdqF4Acxxw==" ], "X-CSE-MsgGUID": [ "W4U7yjZ6QYOHsbp15eMgMg==", "y8JOHS2UQFiX9p1/SLAxkA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687421\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687421\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445120\"" ], "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 55/92] NAN: Add supported cipher suite list to the discovery\n result callback", "Date": "Wed, 22 Apr 2026 15:23:46 +0300", "Message-ID": "<20260422122424.43776-56-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_052645_359447_6F3B3D7A ", "X-CRM114-Status": "GOOD ( 17.15 )", "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> When a\n service\n is discovered,\n get the supported cipher suites from the Cipher Suite Information\n attribute and add them to the discovery result callback. Signed-off-by:\n Avraham\n Stern <avraham.stern@intel.com> --- src/ap/nan_usd_ap.c | 4 +-\n src/common/nan_de.c\n | 82 ++++++++++++++++++++++++++++++++- src/common/nan_de.h | 4 +-\n wpa_supplicant/nan_supplican\n [...]\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\nWhen a service is discovered, get the supported cipher suites from\nthe Cipher Suite Information attribute and add them to the discovery\nresult callback.\n\nSigned-off-by: Avraham Stern <avraham.stern@intel.com>\n---\n src/ap/nan_usd_ap.c | 4 +-\n src/common/nan_de.c | 82 ++++++++++++++++++++++++++++++++-\n src/common/nan_de.h | 4 +-\n wpa_supplicant/nan_supplicant.c | 4 +-\n 4 files changed, 90 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/ap/nan_usd_ap.c b/src/ap/nan_usd_ap.c\nindex d7719e89cb..41e99510d9 100644\n--- a/src/ap/nan_usd_ap.c\n+++ b/src/ap/nan_usd_ap.c\n@@ -49,7 +49,9 @@ hostapd_nan_de_discovery_result(void *ctx, int subscribe_id,\n \t\t\t\tconst u8 *ssi, size_t ssi_len,\n \t\t\t\tint peer_publish_id, const u8 *peer_addr,\n \t\t\t\tbool fsd, bool fsd_gas,\n-\t\t\t\tconst u8 *pmkid_list, size_t pmkid_count)\n+\t\t\t\tconst u8 *pmkid_list, size_t pmkid_count,\n+\t\t\t\tconst u8 *cipher_suite,\n+\t\t\t\tsize_t n_cipher_suite)\n {\n \tstruct hostapd_data *hapd = ctx;\n \tchar *ssi_hex;\ndiff --git a/src/common/nan_de.c b/src/common/nan_de.c\nindex 7a728c45b5..4959ccd7fb 100644\n--- a/src/common/nan_de.c\n+++ b/src/common/nan_de.c\n@@ -1132,6 +1132,73 @@ static void nan_de_get_sdea(const u8 *buf, size_t len, u8 instance_id,\n }\n \n \n+static size_t nan_de_parse_csia(const u8 *buf, size_t len, u8 instance_id,\n+\t\t\t\tu8 *cipher_suites, size_t max_cipher_suites,\n+\t\t\t\tu8 *capabilities)\n+{\n+\tconst u8 *csia, *pos, *end;\n+\tu16 csia_len;\n+\tsize_t cs_count = 0;\n+\tstruct nan_cipher_suite_info *cs_info;\n+\n+\tcsia = nan_de_get_attr(buf, len, NAN_ATTR_CSIA, 0);\n+\tif (!csia)\n+\t\treturn 0;\n+\n+\tcsia++;\n+\tcsia_len = WPA_GET_LE16(csia);\n+\tcsia += 2;\n+\n+\tif (csia_len < 1)\n+\t\treturn 0;\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: Parsing Cipher Suite Information attribute (len=%u)\",\n+\t\t csia_len);\n+\n+\tcs_info = (struct nan_cipher_suite_info *)csia;\n+\n+\tif (capabilities)\n+\t\t*capabilities = cs_info->capab;\n+\n+\tpos = cs_info->cs;\n+\tend = csia + csia_len;\n+\n+\t/* Parse cipher suite list. Each entry is 2 bytes (csid + publish_id) */\n+\twhile (end - pos >= 2 && cs_count < max_cipher_suites) {\n+\t\tu8 csid = *pos;\n+\t\tu8 publish_id = pos[1];\n+\n+\t\tpos += 2;\n+\n+\t\tif (csid == NAN_CS_NONE || csid >= NAN_CS_MAX) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Invalid cipher suite ID %u for publish ID %u\",\n+\t\t\t\t csid, publish_id);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Cipher suite ID %u for publish ID %u\",\n+\t\t\t csid, publish_id);\n+\n+\t\t/* Only include cipher suites for the matching publish ID */\n+\t\tif (publish_id == instance_id) {\n+\t\t\tcipher_suites[cs_count++] = csid;\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Added cipher suite %u for matching publish ID %u\",\n+\t\t\t\t csid, instance_id);\n+\t\t}\n+\t}\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: Parsed %zu cipher suites from CSIA for publish ID %u\",\n+\t\t cs_count, instance_id);\n+\n+\treturn cs_count;\n+}\n+\n+\n static size_t nan_de_parse_scia(const u8 *buf, size_t len, u8 instance_id,\n \t\t\t\tu8 *pmkid_list, size_t max_pmkids)\n {\n@@ -1336,6 +1403,9 @@ static bool nan_de_rx_publish(struct nan_de *de, struct nan_de_service *srv,\n \t/* The SCIA can potentially contain a PMKID for each cipher suite */\n \tu8 pmkid_list[(NAN_CS_MAX - 1) * PMKID_LEN];\n \tsize_t pmkid_count = 0;\n+\t/* Cipher suites from CSIA */\n+\tu8 cipher_suites[NAN_CS_MAX - 1];\n+\tsize_t cipher_suite_count = 0;\n \n \tif (!nan_de_filter_match(srv, matching_filter, matching_filter_len))\n \t\treturn false;\n@@ -1376,6 +1446,14 @@ static bool nan_de_rx_publish(struct nan_de *de, struct nan_de_service *srv,\n \t}\n \n send_event:\n+\t/* Parse Cipher Suite Information Attribute for cipher suites */\n+\tif (buf && buf_len > 0) {\n+\t\tcipher_suite_count =\n+\t\t\tnan_de_parse_csia(buf, buf_len, instance_id,\n+\t\t\t\t\t cipher_suites,\n+\t\t\t\t\t ARRAY_SIZE(cipher_suites), NULL);\n+\t}\n+\n \t/* Parse Security Context Information attribute for PMKIDs */\n \tif (buf && buf_len > 0) {\n \t\tpmkid_count = nan_de_parse_scia(buf, buf_len, instance_id,\n@@ -1391,7 +1469,9 @@ send_event:\n \t\t\tsdea_control & NAN_SDEA_CTRL_FSD_REQ,\n \t\t\tsdea_control & NAN_SDEA_CTRL_FSD_GAS,\n \t\t\tpmkid_count > 0 ? pmkid_list : NULL,\n-\t\t\tpmkid_count);\n+\t\t\tpmkid_count,\n+\t\t\tcipher_suite_count > 0 ? cipher_suites : NULL,\n+\t\t\tcipher_suite_count);\n \n \treturn true;\n }\ndiff --git a/src/common/nan_de.h b/src/common/nan_de.h\nindex de7f08e7ea..b9801c2536 100644\n--- a/src/common/nan_de.h\n+++ b/src/common/nan_de.h\n@@ -38,7 +38,9 @@ struct nan_callbacks {\n \t\t\t\t const u8 *ssi, size_t ssi_len,\n \t\t\t\t int peer_publish_id,\n \t\t\t\t const u8 *peer_addr, bool fsd, bool fsd_gas,\n-\t\t\t\t const u8 *pmkid_list, size_t pmkid_count);\n+\t\t\t\t const u8 *pmkid_list, size_t pmkid_count,\n+\t\t\t\t const u8 *cipher_suite,\n+\t\t\t\t size_t n_cipher_suite);\n \n \tvoid (*replied)(void *ctx, int publish_id, const u8 *peer_addr,\n \t\t\tint peer_subscribe_id,\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex e33a41cef3..495cae0e2c 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -3139,7 +3139,9 @@ wpas_nan_de_discovery_result(void *ctx, int subscribe_id,\n \t\t\t enum nan_service_protocol_type srv_proto_type,\n \t\t\t const u8 *ssi, size_t ssi_len, int peer_publish_id,\n \t\t\t const u8 *peer_addr, bool fsd, bool fsd_gas,\n-\t\t\t const u8 *pmkid_list, size_t pmkid_count)\n+\t\t\t const u8 *pmkid_list, size_t pmkid_count,\n+\t\t\t const u8 *cipher_suite,\n+\t\t\t size_t n_cipher_suite)\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n \n", "prefixes": [ "55/92" ] }