[PATCH 52/92] wpa_supplicant: Add nd_pmk parameter to NAN_PUBLISH command

[Andrei Otcheretianski]

From: Avraham Stern <avraham.stern at intel.com>

Allow specifying a NAN Data Path PMK (ND-PMK) in the NAN_PUBLISH
command. When provided along with cipher_suites, PMKIDs will be
derived for each cipher suite and included in the Security Context
Information attribute in publish messages.

The nd_pmk parameter expects a hex string of length 32 bytes (64 hex
characters).

Example usage:
NAN_PUBLISH service_name=test cipher_suites=1,2 \
nd_pmk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef

Signed-off-by: Avraham Stern <avraham.stern at intel.com>
---
 wpa_supplicant/ctrl_iface.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 5570df81c6..78a86f8c89 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -12779,6 +12779,7 @@ static int wpas_ctrl_nan_publish(struct wpa_supplicant *wpa_s, char *cmd,
 	enum nan_service_protocol_type srv_proto_type = 0;
 	int *freq_list = NULL;
 	int *cipher_list = NULL;
+	u8 nd_pmk[PMK_LEN];
 	bool p2p = false;
 
 	os_memset(&params, 0, sizeof(params));
@@ -12904,6 +12905,23 @@ static int wpas_ctrl_nan_publish(struct wpa_supplicant *wpa_s, char *cmd,
 			continue;
 		}
 
+		if (os_strncmp(token, "nd_pmk=", 7) == 0) {
+			if (params.nd_pmk) {
+				wpa_printf(MSG_INFO,
+					   "CTRL: Duplicate nd_pmk parameter");
+				goto fail;
+			}
+
+			if (hexstr2bin(token + 7, nd_pmk, PMK_LEN) < 0) {
+				wpa_printf(MSG_INFO,
+					   "CTRL: Invalid nd_pmk value");
+				goto fail;
+			}
+
+			params.nd_pmk = nd_pmk;
+			continue;
+		}
+
 		wpa_printf(MSG_INFO, "CTRL: Invalid NAN_PUBLISH parameter: %s",
 			   token);
 		goto fail;
@@ -12914,6 +12932,9 @@ static int wpas_ctrl_nan_publish(struct wpa_supplicant *wpa_s, char *cmd,
 	if (publish_id > 0)
 		ret = os_snprintf(buf, buflen, "%d", publish_id);
 fail:
+	if (params.nd_pmk)
+		forced_memzero(nd_pmk, PMK_LEN);
+
 	wpabuf_free(ssi);
 	os_free(freq_list);
 	os_free(cipher_list);
-- 
2.53.0