Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226387/?format=api
{ "id": 2226387, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226387/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-42-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-42-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:23:32", "name": "[41/92] NAN: Set PASN data for pairing verification", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "bc6eaa900200c475d0327f8e79ac70866cc6cba4", "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-42-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/2226387/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226387/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=zJ+S+mVl;\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=dEEBb8dW;\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 4g0z5W596vz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:27:59 +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 1wFWfs-0000000A60q-3pVp;\n\tWed, 22 Apr 2026 12:27:24 +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 1wFWeS-0000000A3P1-2pqH\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:26:08 +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:25:41 -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:25:40 -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=npq6O9tFKX+kq96vsKcDPaSw4X8rPoTi0SaIJVJVdTg=; b=zJ+S+mVlhxjtCj\n\tw2AyWMggvDsvdDQW/1wbJQexwI4A88Qr1lOd9aHniyK5XUBedgjfBCH5xpaALw68EP9p1kEUSOKfB\n\tpr9fIfzN2GpUftSTuT0cOgO6l7dd58GGTO6RcAQWAcbe/lriyjoRFMcSj1jS1+nUM8vdflOHgj+uP\n\tkzd42ixxvrY8LeRgoEgdjr3OiQhi1T8AwRtS3RcxUZM4EWtgKaAVYDsNk2vpXa3kFVVeDw+ZqKjXJ\n\tutKrYT/yBU6dLa7lv4KREIU1G7OhkqtinguPUuXv35YRseU5497BOi4SR+dqCx2YlJeGP/tprJBfF\n\tILHG/tttBH+Jhyog6aYA==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860756; x=1808396756;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=2HzkQe4YTLmhbSqeDT8afWFoFqkNrsHd4Zp5RsvaDOw=;\n b=dEEBb8dWdYt6c69o4wBHbK541z4ygy5MAWaJ8hCrxFCyGiCIU2/bJWc8\n LxASblXSYlqNd3Ijkg/rHdROazMFHECrxBQ8ML/EZN4bbY20gs+uTy+SH\n yFyhNv5UAfYgV/mtzao4ZpxP8c64w5sjxTMBcCkjwL0mePV5hj3WrIbQn\n 5BiovGyUPWocYeVs5kpsYDk+P0JKf0T2JJwEBbpTkmzFKhV+/tuGoa0hn\n A3hLkNy6y0rh4NaZcydJLERq+Gxkt74GzNvRBK28CfkwmyLnsCVEDawA0\n cm/K8hWO/ZFTJzI0il9L5yw/TKdpL7LmGcVt8Yb14uZkvIGgvxoWaao7c\n Q==;" ], "X-CSE-ConnectionGUID": [ "aIxSgJoIQHq7WLQbJQZA2A==", "I/1EC+RzRuqurdKhg6KVUw==" ], "X-CSE-MsgGUID": [ "EynZYMzeQ/2gw3PmovXtgQ==", "BUcxgmDrReCW7rU3Hpg/Rw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687355\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687355\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445028\"" ], "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 41/92] NAN: Set PASN data for pairing verification", "Date": "Wed, 22 Apr 2026 15:23:32 +0300", "Message-ID": "<20260422122424.43776-42-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_052556_825334_72DF12A4 ", "X-CRM114-Status": "GOOD ( 20.19 )", "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 pairing\n verification is requested,\n set the PASN data with the cached NPK as the PMK\n and use the AKMP used in the original pairing. Set the PMKID to a custom\n PMKID as defined in Wi-Fi Aware specif [...]\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 pairing verification is requested, set the PASN data with the\ncached NPK as the PMK and use the AKMP used in the original pairing.\nSet the PMKID to a custom PMKID as defined in Wi-Fi Aware\nspecification version 4.0, section 7.6.5.\n\nSigned-off-by: Avraham Stern <avraham.stern@intel.com>\n---\n src/nan/nan.h | 15 ++++++\n src/nan/nan_pairing.c | 107 +++++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 120 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 6e16e006c3..47fbc1e067 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -640,6 +640,21 @@ struct nan_config {\n \t\t\t\t\t size_t nik_len, int cipher_ver,\n \t\t\t\t\t int nik_lifetime, int akmp, u8 *npk,\n \t\t\t\t\t size_t npk_len);\n+\n+\t/**\n+\t * get_npk_akmp - Get the cached NPK and AKMP for a peer\n+\t *\n+\t * @ctx: Callback context from cb_ctx\n+\t * @peer_nmi: Peer NMI address\n+\t * @nonce: Nonce from the peer's NIRA\n+\t * @tag: Tag from the peer's NIRA\n+\t * @akmp: On success, would hold the AKMP suite used to establish\n+\t *\tthe NPKSA.\n+\t * Returns: The NPK on success, NULL on failure\n+\t */\n+\tconst struct wpabuf *(*get_npk_akmp)(void *ctx, const u8 *peer_nmi,\n+\t\t\t\t\t const u8 *nonce, const u8 *tag,\n+\t\t\t\t\t int *akmp);\n };\n \n struct nan_data * nan_init(const struct nan_config *cfg);\ndiff --git a/src/nan/nan_pairing.c b/src/nan/nan_pairing.c\nindex 35c140ca9f..4f88ba37e3 100644\n--- a/src/nan/nan_pairing.c\n+++ b/src/nan/nan_pairing.c\n@@ -123,6 +123,12 @@ static bool nan_pairing_is_supported(struct nan_data *nan_data,\n \t\t\t\t \"NAN: Pairing: Peer doesn't support pairing verification\");\n \t\t\treturn false;\n \t\t}\n+\n+\t\tif (!nan_data->cfg->get_npk_akmp) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Pairing: get_npk_akmp callback not set\");\n+\t\t\treturn false;\n+\t\t}\n \t}\n \n \treturn true;\n@@ -194,6 +200,97 @@ static int nan_pairing_send_cb(void *ctx, const u8 *data, size_t data_len,\n }\n \n \n+/*\n+ * nan_pasn_verification_init - Initialize PASN data for pairing verification\n+ *\n+ * @nan_data: Pointer to NAN data structure containing configuration\n+ * @peer: Pointer to the NAN peer structure\n+ * Returns: 0 on success, -1 on failure\n+ *\n+ * This function gets the NPK and AKMP for the given peer and sets it as the\n+ * PASN PMK and AKMP. It also generates the NIRA nonce and tag to be used as the\n+ * custom PMKID for the PASN verification process.\n+ */\n+static int nan_pasn_verification_init(struct nan_data *nan_data,\n+\t\t\t\t struct nan_peer *peer)\n+{\n+\tstruct nan_pairing_peer_data *pairing_data;\n+\tconst struct wpabuf *npk;\n+\tint akmp;\n+\tu8 npkid[NAN_NIRA_NONCE_LEN + NAN_NIRA_TAG_LEN];\n+\tstruct pasn_data *pasn;\n+\n+\tpairing_data = &peer->pairing;\n+\tpasn = pairing_data->pasn;\n+\n+\tif (!pairing_data->nonce_tag_valid) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Pairing: NIK ID not available for verification\");\n+\t\treturn -1;\n+\t}\n+\n+\tnpk = nan_data->cfg->get_npk_akmp(nan_data->cfg->cb_ctx, peer->nmi_addr,\n+\t\t\t\t\t pairing_data->nonce,\n+\t\t\t\t\t pairing_data->tag, &akmp);\n+\tif (!npk) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Pairing: Failed to get NPK AKMP for verification\");\n+\t\treturn -1;\n+\t}\n+\n+\tpasn_set_akmp(pairing_data->pasn, akmp);\n+\n+\tos_free(pasn->pasn_groups);\n+\tpasn->pasn_groups = os_calloc(2, sizeof(int));\n+\tif (!pasn->pasn_groups) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Pairing: Failed to allocate PASN groups\");\n+\t\treturn -1;\n+\t}\n+\n+\tpasn->pasn_groups[0] = pasn->group;\n+\n+\tif (pairing_data->self_pairing_role == NAN_PAIRING_ROLE_INITIATOR)\n+\t\tpasn_initiator_pmksa_cache_add(nan_data->initiator_pmksa,\n+\t\t\t\t\t nan_data->cfg->nmi_addr,\n+\t\t\t\t\t peer->nmi_addr,\n+\t\t\t\t\t wpabuf_head_u8(npk),\n+\t\t\t\t\t wpabuf_len(npk), NULL, akmp);\n+\telse\n+\t\tpasn_responder_pmksa_cache_add(nan_data->responder_pmksa,\n+\t\t\t\t\t nan_data->cfg->nmi_addr,\n+\t\t\t\t\t peer->nmi_addr,\n+\t\t\t\t\t wpabuf_head_u8(npk),\n+\t\t\t\t\t wpabuf_len(npk), NULL, akmp);\n+\n+\t/*\n+\t * According to Wi-Fi Aware Specification version 4.0, section 7.6.5,\n+\t * pairing verification uses NPKID constructed from NIRA nonce and tag.\n+\t * The same nonce and tag should be used in the NIRA added to PASN\n+\t * first and second frames.\n+\t */\n+\tif (nan_nira_get_tag_nonce(nan_data->cfg, npkid,\n+\t\t\t\t &npkid[NAN_NIRA_NONCE_LEN]) < 0) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to get NIRA tag and nonce\");\n+\t\treturn -1;\n+\t}\n+\n+\tpasn_set_custom_pmkid(pairing_data->pasn, npkid);\n+\treturn 0;\n+}\n+\n+\n+static int nan_validate_custom_pmkid(void *ctx, const u8 *addr, const u8 *pmkid)\n+{\n+\t/*\n+\t * In NAN pairing, custom PMKID is constructed from NIRA nonce and tag.\n+\t * Matching the tag to a known NIK is done during NIRA validation\n+\t * so here we just accept any PMKID.\n+\t */\n+\treturn 0;\n+}\n+\n+\n static int nan_pairing_pasn_initialize(struct nan_data *nan_data,\n \t\t\t\t struct nan_peer *peer, u8 auth_mode,\n \t\t\t\t int cipher, const char *password,\n@@ -268,6 +365,12 @@ static int nan_pairing_pasn_initialize(struct nan_data *nan_data,\n \t\t\tgoto fail;\n \t\t}\n \t\tpasn->pasn_groups[0] = pasn->group;\n+\t} else if (auth_mode == NAN_PASN_AUTH_MODE_PMK) {\n+\t\tif (nan_pasn_verification_init(nan_data, peer)) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Pairing: PASN verification init failed\");\n+\t\t\tgoto fail;\n+\t\t}\n \t} else {\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: Pairing: Unsupported authentication mode %u\",\n@@ -290,8 +393,8 @@ static int nan_pairing_pasn_initialize(struct nan_data *nan_data,\n \t\twpabuf_free(rsnxe);\n \t}\n \n-\tpasn_register_callbacks(pasn, nan_data, nan_pairing_send_cb, NULL,\n-\t\t\t\tNULL, NULL);\n+\tpasn_register_callbacks(pasn, nan_data, nan_pairing_send_cb,\n+\t\t\t\tnan_validate_custom_pmkid, NULL, NULL);\n \treturn 0;\n \n fail:\n", "prefixes": [ "41/92" ] }