From e7d8842e6bae5c3757883de9a6789a88adb74238 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Thu, 13 Feb 2020 08:51:23 +0000 Subject: [PATCH] OWE: Rename owe_assoc_req_process() parameter reason to status In the function owe_assoc_req_process(), values assigned to the reason argument imply that it should be renamed to status. Rename 'reason' to 'status' and modify the uses of owe_assoc_req_process() accordingly. Signed-off-by: Sergey Matyukevich --- src/ap/drv_callbacks.c | 8 ++++---- src/ap/ieee802_11.c | 14 +++++++------- src/ap/ieee802_11.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index fdd845573..38506a097 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -577,18 +577,18 @@ skip_wpa_check: npos = owe_assoc_req_process(hapd, sta, elems.owe_dh, elems.owe_dh_len, p, sizeof(buf) - (p - buf), - &reason); + &status); if (npos) p = npos; + if (!npos && - reason == WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED) { - status = WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED; + status == WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED) { hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf); return 0; } - if (!npos || reason != WLAN_STATUS_SUCCESS) + if (!npos || status != WLAN_STATUS_SUCCESS) goto fail; } #endif /* CONFIG_OWE */ diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 625e10b4b..68fdba4e0 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -3951,12 +3951,12 @@ done: #ifdef CONFIG_OWE u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, const u8 *owe_dh, u8 owe_dh_len, - u8 *owe_buf, size_t owe_buf_len, u16 *reason) + u8 *owe_buf, size_t owe_buf_len, u16 *status) { #ifdef CONFIG_TESTING_OPTIONS if (hapd->conf->own_ie_override) { wpa_printf(MSG_DEBUG, "OWE: Using IE override"); - *reason = WLAN_STATUS_SUCCESS; + *status = WLAN_STATUS_SUCCESS; return wpa_auth_write_assoc_resp_owe(sta->wpa_sm, owe_buf, owe_buf_len, NULL, 0); } @@ -3966,18 +3966,18 @@ u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, wpa_printf(MSG_DEBUG, "OWE: Using PMKSA caching"); owe_buf = wpa_auth_write_assoc_resp_owe(sta->wpa_sm, owe_buf, owe_buf_len, NULL, 0); - *reason = WLAN_STATUS_SUCCESS; + *status = WLAN_STATUS_SUCCESS; return owe_buf; } if (sta->owe_pmk && sta->external_dh_updated) { wpa_printf(MSG_DEBUG, "OWE: Using previously derived PMK"); - *reason = WLAN_STATUS_SUCCESS; + *status = WLAN_STATUS_SUCCESS; return owe_buf; } - *reason = owe_process_assoc_req(hapd, sta, owe_dh, owe_dh_len); - if (*reason != WLAN_STATUS_SUCCESS) + *status = owe_process_assoc_req(hapd, sta, owe_dh, owe_dh_len); + if (*status != WLAN_STATUS_SUCCESS) return NULL; owe_buf = wpa_auth_write_assoc_resp_owe(sta->wpa_sm, owe_buf, @@ -3988,7 +3988,7 @@ u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, pub = crypto_ecdh_get_pubkey(sta->owe_ecdh, 0); if (!pub) { - *reason = WLAN_STATUS_UNSPECIFIED_FAILURE; + *status = WLAN_STATUS_UNSPECIFIED_FAILURE; return owe_buf; } diff --git a/src/ap/ieee802_11.h b/src/ap/ieee802_11.h index 635fc8cd6..0a035c564 100644 --- a/src/ap/ieee802_11.h +++ b/src/ap/ieee802_11.h @@ -163,7 +163,7 @@ void ieee802_11_finish_fils_auth(struct hostapd_data *hapd, const u8 *msk, size_t msk_len); u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, const u8 *owe_dh, u8 owe_dh_len, - u8 *owe_buf, size_t owe_buf_len, u16 *reason); + u8 *owe_buf, size_t owe_buf_len, u16 *status); u16 owe_process_rsn_ie(struct hostapd_data *hapd, struct sta_info *sta, const u8 *rsn_ie, size_t rsn_ie_len, const u8 *owe_dh, size_t owe_dh_len);