From 69d7c8e6bb17536e095944335b8fd144ffe4e7d4 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 22 Jul 2022 21:04:08 +0300 Subject: [PATCH] DPP: Add peer=id entry for PKEX-over-TCP case The peer= information about the specific boostrapping key provided through PKEX was added for Public Action frame cases, but the TCP variant did not do same. Add the same information there to maintain knowledge of the specific peer bootstrapping key from PKEX to Authentication exchange. Signed-off-by: Jouni Malinen --- src/ap/dpp_hostapd.c | 6 +++--- wpa_supplicant/dpp_supplicant.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c index ed4625dde..37969a364 100644 --- a/src/ap/dpp_hostapd.c +++ b/src/ap/dpp_hostapd.c @@ -300,7 +300,7 @@ static int hostapd_dpp_pkex_done(void *ctx, void *conn, struct dpp_bootstrap_info *peer_bi) { struct hostapd_data *hapd = ctx; - const char *cmd = hapd->dpp_pkex_auth_cmd; + char cmd[500]; const char *pos; u8 allowed_roles = DPP_CAPAB_CONFIGURATOR; struct dpp_bootstrap_info *own_bi = NULL; @@ -308,8 +308,8 @@ static int hostapd_dpp_pkex_done(void *ctx, void *conn, hostapd_dpp_pkex_clear_code(hapd); - if (!cmd) - cmd = ""; + os_snprintf(cmd, sizeof(cmd), " peer=%u %s", peer_bi->id, + hapd->dpp_pkex_auth_cmd ? hapd->dpp_pkex_auth_cmd : ""); wpa_printf(MSG_DEBUG, "DPP: Start authentication after PKEX (cmd: %s)", cmd); diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c index 7901f0115..d03e79297 100644 --- a/wpa_supplicant/dpp_supplicant.c +++ b/wpa_supplicant/dpp_supplicant.c @@ -2785,7 +2785,7 @@ static int wpas_dpp_pkex_done(void *ctx, void *conn, struct dpp_bootstrap_info *peer_bi) { struct wpa_supplicant *wpa_s = ctx; - const char *cmd = wpa_s->dpp_pkex_auth_cmd; + char cmd[500]; const char *pos; u8 allowed_roles = DPP_CAPAB_CONFIGURATOR; struct dpp_bootstrap_info *own_bi = NULL; @@ -2793,8 +2793,8 @@ static int wpas_dpp_pkex_done(void *ctx, void *conn, wpas_dpp_pkex_clear_code(wpa_s); - if (!cmd) - cmd = ""; + os_snprintf(cmd, sizeof(cmd), " peer=%u %s", peer_bi->id, + wpa_s->dpp_pkex_auth_cmd ? wpa_s->dpp_pkex_auth_cmd : ""); wpa_printf(MSG_DEBUG, "DPP: Start authentication after PKEX (cmd: %s)", cmd); -- 2.47.2