From 8471d940e394e4f586816f73a0aedd17b58f6495 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 24 Sep 2021 21:02:19 +0300 Subject: [PATCH] Move pmf_in_use() into a more generic file This function is not specific to GAS, so make it available throughout wpa_supplicant without requiring CONFIG_GAS. Signed-off-by: Jouni Malinen --- wpa_supplicant/gas_query.c | 10 ---------- wpa_supplicant/gas_query.h | 1 - wpa_supplicant/wpa_supplicant.c | 10 ++++++++++ wpa_supplicant/wpa_supplicant_i.h | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c index e60a8c1fe..a6172d692 100644 --- a/wpa_supplicant/gas_query.c +++ b/wpa_supplicant/gas_query.c @@ -273,16 +273,6 @@ static void gas_query_tx_status(struct wpa_supplicant *wpa_s, } -int pmf_in_use(struct wpa_supplicant *wpa_s, const u8 *addr) -{ - if (wpa_s->current_ssid == NULL || - wpa_s->wpa_state < WPA_4WAY_HANDSHAKE || - os_memcmp(addr, wpa_s->bssid, ETH_ALEN) != 0) - return 0; - return wpa_sm_pmf_enabled(wpa_s->wpa); -} - - static int gas_query_tx(struct gas_query *gas, struct gas_query_pending *query, struct wpabuf *req, unsigned int wait_time) { diff --git a/wpa_supplicant/gas_query.h b/wpa_supplicant/gas_query.h index f9ce7b680..6ccecd4dd 100644 --- a/wpa_supplicant/gas_query.h +++ b/wpa_supplicant/gas_query.h @@ -19,7 +19,6 @@ void gas_query_deinit(struct gas_query *gas); int gas_query_rx(struct gas_query *gas, const u8 *da, const u8 *sa, const u8 *bssid, u8 categ, const u8 *data, size_t len, int freq); -int pmf_in_use(struct wpa_supplicant *wpa_s, const u8 *addr); /** * enum gas_query_result - GAS query result diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 2d1023963..51c8da4a3 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -7812,6 +7812,16 @@ int wpas_get_ssid_pmf(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) } +int pmf_in_use(struct wpa_supplicant *wpa_s, const u8 *addr) +{ + if (wpa_s->current_ssid == NULL || + wpa_s->wpa_state < WPA_4WAY_HANDSHAKE || + os_memcmp(addr, wpa_s->bssid, ETH_ALEN) != 0) + return 0; + return wpa_sm_pmf_enabled(wpa_s->wpa); +} + + int wpas_is_p2p_prioritized(struct wpa_supplicant *wpa_s) { if (wpa_s->global->conc_pref == WPA_CONC_PREF_P2P) diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 951d3ee1b..cda8a114e 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -1763,6 +1763,7 @@ static inline int wpas_mode_to_ieee80211_mode(enum wpas_mode mode) int wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); int wpas_get_ssid_pmf(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); +int pmf_in_use(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_init_ext_pw(struct wpa_supplicant *wpa_s);