Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2218819/?format=api
{ "id": 2218819, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2218819/?format=api", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.0/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": "" }, "msgid": "<20260401220220.4418-30-andrei.otcheretianski@intel.com>", "date": "2026-04-01T22:01:38", "name": "[29/71] wpa_supplicant: Support NDP setup with PMK", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6d44f902d954c3780a5a34516fe9552e6a9a4242", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.0/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260401220220.4418-30-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 498402, "url": "http://patchwork.ozlabs.org/api/1.0/series/498402/?format=api", "date": "2026-04-01T22:01:09", "name": "NAN Data Path and Bootstrapping support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498402/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218819/checks/", "tags": {}, "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=KwHnI0eB;\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=EHn8eQ7j;\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 4fmJxf724zz1yGY\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:07:18 +1100 (AEDT)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hw-0000000GBVT-1VtN;\n\tWed, 01 Apr 2026 22:06:40 +0000", "from mgamail.intel.com ([198.175.65.20])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83h3-0000000G9xK-2Z53\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:05:49 +0000", "from fmviesa003.fm.intel.com ([10.60.135.143])\n by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:44 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:44 -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:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=5Q64MJcFnS5HHsy0gb8YBzG8BmecMmB8tsqT1csNTlc=; b=KwHnI0eBYeOdec\n\tNI9LjoC5f6O1ItZw6lb2aH8D/ouEW6L9TH7hucFQq8Kw7msruWtepEcKQq0ANSzP794SDi0t8onvC\n\t8DJVVt8YE121MdryjA6nUBFApqRWzeMvh5ywfhJWAQpEdBynJjEhHk2gBNFT8KyWf4i+VKgnpKtt1\n\tzES/pD8tlGCaGXjiVbHADDcGn5DL3KoxJgldFjAkx0quPuWKrJIvzsHFL6/+dsKA4FV9UnNSsX7/U\n\ta/7g/okLS3C8z+WcYnlQNmD89MoAULBD5Ieg54vCjaF7bja8MG3mq0M0ptu8gJHzwjAdJpKaj4hFi\n\tZxrAafQl7fcZPld29Jpw==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081145; x=1806617145;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=sEJ9Rsk42sk4luGg5bKTHiOYVkHspKdLbf0SGq5ZRko=;\n b=EHn8eQ7jmTyP2jSXZBjvyEL1LLTDgDgn0SHkhbWINopexKfT69FO6AXW\n ECV6EV928Y2XbRABtWODfPNw/l45fLxFQodmBj18AqKWZ4PdPURJB3jPt\n n/7lpPA7fdnnyAYLWw3mNsIOHXteqI7mGGEpLfk8g+5TuNbE6SI7iV3Yb\n VIk6M2X4WSJk2vhuC3s4yTS9bx+TCAeNmEMUjcLTWg6rTMZQUW3A1+ut2\n p3kpCbL/cHbB2MYIsUB/GQx1BVxjQUBv02cXnbyOelOM4rOnuFPVWN9Ll\n 464idTblb9R1HHVEY3oCz+K14jzniHBRIQnDUx6MONyO7OD/Ji1jQtafM\n g==;" ], "X-CSE-ConnectionGUID": [ "UwSLbDnSRDmBlZfX/MhmWg==", "CjbVpqypTf2p7NHaooHy2Q==" ], "X-CSE-MsgGUID": [ "AApbv+TUT4i2SSLtPw+JEA==", "aIMrGCjrQMCPuSvXXCg9bw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11746\"; a=\"75851613\"", "E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851613\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Subject": "[PATCH 29/71] wpa_supplicant: Support NDP setup with PMK", "Date": "Thu, 2 Apr 2026 01:01:38 +0300", "Message-ID": "<20260401220220.4418-30-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260401220220.4418-1-andrei.otcheretianski@intel.com>", "References": "<20260401220220.4418-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-20260401_150545_758138_E1B4411D ", "X-CRM114-Status": "GOOD ( 13.75 )", "X-Spam-Score": "-1.9 (-)", "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: Add control interface API to configure PMK directly and\n skip\n derivation from password. Signed-off-by: Andrei Otcheretianski\n <andrei.otcheretianski@intel.com>\n --- wpa_supplicant/nan_supplicant.c | 60 ++++++++++++++++++++++++++-------\n 1 file changed, 48 insertions(+), 12 deletions(-)\n Content analysis details: (-1.9 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.20 listed in list.dnswl.org]\n 1.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in\n bl.score.senderscore.com]\n 1.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The\n query to Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in\n sa-trusted.bondedsender.org]\n 1.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.20 listed in sa-accredit.habeas.com]\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_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.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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.5 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": "Add control interface API to configure PMK directly and skip derivation\nfrom password.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n wpa_supplicant/nan_supplicant.c | 60 ++++++++++++++++++++++++++-------\n 1 file changed, 48 insertions(+), 12 deletions(-)", "diff": "diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 936d0b8156..3a076c044e 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -1247,7 +1247,8 @@ static int wpas_nan_fill_nd_pmk(struct wpa_supplicant *wpa_s,\n \t\t\t\tstruct nan_ndp_params *ndp,\n \t\t\t\tint handle,\n \t\t\t\tconst u8 *publisher_nmi,\n-\t\t\t\tconst char *pwd)\n+\t\t\t\tconst char *pwd_pmk,\n+\t\t\t\tbool pmk)\n {\n \tu8 service_id[NAN_SERVICE_ID_LEN];\n \n@@ -1272,9 +1273,9 @@ static int wpas_nan_fill_nd_pmk(struct wpa_supplicant *wpa_s,\n \t\t\treturn -1;\n \t}\n \n-\tif (!pwd || os_strlen(pwd) == 0) {\n+\tif (!pwd_pmk || os_strlen(pwd_pmk) == 0) {\n \t\twpa_printf(MSG_DEBUG,\n-\t\t\t \"NAN: Password required for CSID %d\",\n+\t\t\t \"NAN: Password/PMK required for CSID %d\",\n \t\t\t ndp->sec.csid);\n \t\treturn -1;\n \t}\n@@ -1293,20 +1294,39 @@ static int wpas_nan_fill_nd_pmk(struct wpa_supplicant *wpa_s,\n \t\treturn -1;\n \t}\n \n-\treturn nan_crypto_derive_nd_pmk(pwd, service_id, ndp->sec.csid,\n+\tif (pmk) {\n+\t\tif (os_strlen(pwd_pmk) != PMK_LEN * 2) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Invalid PMK length: %zu\",\n+\t\t\t\t os_strlen(pwd_pmk));\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tif (hexstr2bin(pwd_pmk, ndp->sec.pmk, PMK_LEN) < 0) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Invalid PMK hex data: %s\",\n+\t\t\t\t pwd_pmk);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\t/* Derive PMK from password */\n+\treturn nan_crypto_derive_nd_pmk(pwd_pmk, service_id, ndp->sec.csid,\n \t\t\t\t\tpublisher_nmi, ndp->sec.pmk);\n }\n \n \n /* Command format NAN_NDP_REQUEST handle=<id> ndi=<ifname> peer_nmi=<nmi>\n peer_id=<peer_instance_id> ssi=<hexdata> qos=<slots:latency>\n- [csid = <cipher_suite> password=<string>] */\n+ [csid = <cipher_suite> <password=<string>|pmk=<hex>>] */\n int wpas_nan_ndp_request(struct wpa_supplicant *wpa_s, char *cmd)\n {\n \tstruct nan_ndp_params ndp;\n \tstruct wpabuf *ssi_buf = NULL;\n \tchar *token, *context = NULL;\n-\tchar *pos, *pwd = NULL;\n+\tchar *pos, *pwd = NULL, *pmk = NULL;\n \tint handle = -1;\n \tint ret = -1;\n \n@@ -1398,6 +1418,8 @@ int wpas_nan_ndp_request(struct wpa_supplicant *wpa_s, char *cmd)\n \t\t\tndp.sec.csid = atoi(pos);\n \t\t} else if (os_strcmp(token, \"password\") == 0) {\n \t\t\tpwd = pos;\n+\t\t} else if (os_strcmp(token, \"pmk\") == 0) {\n+\t\t\tpmk = pos;\n \t\t} else {\n \t\t\twpa_printf(MSG_DEBUG, \"NAN: Unknown parameter: %s\",\n \t\t\t\t token);\n@@ -1430,9 +1452,15 @@ int wpas_nan_ndp_request(struct wpa_supplicant *wpa_s, char *cmd)\n \t\tgoto fail;\n \t}\n \n-\t/* Derive NDP PMK if needed */\n+\tif (pmk && pwd) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Specify only one of password or pmk\");\n+\t\tgoto fail;\n+\t}\n+\n \tif (wpas_nan_fill_nd_pmk(wpa_s, &ndp, handle,\n-\t\t\t\t ndp.ndp_id.peer_nmi, pwd) < 0) {\n+\t\t\t\t ndp.ndp_id.peer_nmi, pmk ? pmk : pwd,\n+\t\t\t\t !!pmk) < 0) {\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: Failed to derive NDP PMK\");\n \t\tgoto fail;\n@@ -1460,13 +1488,13 @@ fail:\n [reason_code=<reject_reason>]\n [ndi=<ifname> handle=<service_handle> init_ndi=<ndi>\n ndp_id=<id> [ssi=<hexdata>] [qos=<slots:latency>]\n- [csid=<csid> password=<string>]] */\n+ [csid=<csid> <password=<string>|pmk=<hex>]] */\n int wpas_nan_ndp_response(struct wpa_supplicant *wpa_s, char *cmd)\n {\n \tstruct nan_ndp_params ndp;\n \tstruct wpabuf *ssi_buf = NULL;\n \tchar *token, *context = NULL;\n-\tchar *pos, *pwd = NULL;\n+\tchar *pos, *pwd = NULL, *pmk = NULL;\n \tint handle = -1;\n \tint ret = -1;\n \n@@ -1572,6 +1600,8 @@ int wpas_nan_ndp_response(struct wpa_supplicant *wpa_s, char *cmd)\n \t\t\tndp.sec.csid = atoi(pos);\n \t\t} else if (os_strcmp(token, \"password\") == 0) {\n \t\t\tpwd = pos;\n+\t\t} else if (os_strcmp(token, \"pmk\") == 0) {\n+\t\t\tpmk = pos;\n \t\t} else {\n \t\t\twpa_printf(MSG_DEBUG, \"NAN: Unknown parameter: %s\",\n \t\t\t\t token);\n@@ -1604,9 +1634,15 @@ int wpas_nan_ndp_response(struct wpa_supplicant *wpa_s, char *cmd)\n \t\t\tgoto fail;\n \t\t}\n \n-\t\t/* Fill the ND-PMK if needed */\n+\t\tif (pmk && pwd) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Specify only one of password or pmk\");\n+\t\t\tgoto fail;\n+\t\t}\n+\n \t\tif (wpas_nan_fill_nd_pmk(wpa_s, &ndp, handle,\n-\t\t\t\t\t publisher_nmi, pwd)) {\n+\t\t\t\t\t publisher_nmi, pmk ? pmk : pwd,\n+\t\t\t\t\t !!pmk) < 0) {\n \t\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to derive NDP PMK\");\n \t\t\tgoto fail;\n \t\t}\n", "prefixes": [ "29/71" ] }