[PATCH 22/71] wpa_supplicant: Init NAN security configurations

[Andrei Otcheretianski]

Store supported CSIDs and assign nmi_addr which is needed for some
security derivations.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski at intel.com>
---
 wpa_supplicant/nan_supplicant.c   | 4 ++++
 wpa_supplicant/wpa_supplicant_i.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c
index 58cf4bbcea..266dcb05b6 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -418,6 +418,7 @@ int wpas_nan_init(struct wpa_supplicant *wpa_s)
 
 	os_memset(&nan, 0, sizeof(nan));
 	nan.cb_ctx = wpa_s;
+	os_memcpy(nan.nmi_addr, wpa_s->own_addr, ETH_ALEN);
 
 	nan.start = wpas_nan_start_cb;
 	nan.stop = wpas_nan_stop_cb;
@@ -488,6 +489,9 @@ int wpas_nan_init(struct wpa_supplicant *wpa_s)
 		!!(wpa_s->nan_capa.drv_flags &
 		   WPA_DRIVER_FLAGS_NAN_SUPPORT_USERSPACE_DE);
 
+	/* Currently support shared key suites only */
+	wpa_s->nan_supported_csids = BIT(NAN_CS_SK_CCM_128) |
+				     BIT(NAN_CS_SK_GCM_256);
 	return 0;
 }
 
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 83243fa35d..e9602ff2bc 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1734,6 +1734,7 @@ struct wpa_supplicant {
 	struct nan_cluster_config nan_config;
 	u8 schedule_sequence_id;
 	struct nan_schedule_config nan_sched[MAX_NAN_RADIOS];
+	u16 nan_supported_csids;
 #endif /* CONFIG_NAN */
 #ifdef CONFIG_ENC_ASSOC
 	bool assoc_resp_encrypted; /* Whether (Re)Association Response frame
-- 
2.53.0