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 <sergey.matyukevich.os@quantenna.com>

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index fdd8455738cf6ffd650a7d63fff03002f5e991fc..38506a09711dedad264bce205c7707de9b027d03 100644 (file)
--- 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 625e10b4b835dcb43015000c28589ce9a9ffcfe1..68fdba4e0634ba8ee34c038de58057f20fa31cb1 100644 (file)
--- 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 635fc8cd64195a4a6eb30e8f04f146b51c06aa46..0a035c5642c375a622b185f04af1fd2fd7ef929d 100644 (file)
--- 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);