AP: Get rid of wpa_auth_pmksa_add3()

Simply pass another parameter to wpa_auth_pmksa_add2() instead.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
index a6fcb7ee49e0a1e207a95f963059d9dc972f612a..3c4c4b1f7b61e3d409de7cdc563778f0d387e2c2 100644 (file)
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -1094,7 +1094,7 @@ int hostapd_ctrl_iface_pmksa_add(struct hostapd_data *hapd, char *cmd)
                return -1;
 
        return wpa_auth_pmksa_add2(hapd->wpa_auth, spa, pmk, pmk_len,
-                                  pmkid, expiration, akmp);
+                                  pmkid, expiration, akmp, NULL);
 }
 
 

diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
index 7a8ea4e6010c858065f7fc4af3e2a354eea36d6f..1fee2d6a8afd095c08381f18583350f5fcb0cc95 100644 (file)
--- a/src/ap/dpp_hostapd.c
+++ b/src/ap/dpp_hostapd.c
@@ -2133,7 +2133,7 @@ static void hostapd_dpp_rx_peer_disc_req(struct hostapd_data *hapd,
        else
                expiration = 0;
 
-       if (wpa_auth_pmksa_add3(hapd->wpa_auth, src, intro.pmk, intro.pmk_len,
+       if (wpa_auth_pmksa_add2(hapd->wpa_auth, src, intro.pmk, intro.pmk_len,
                                intro.pmkid, expiration,
                                WPA_KEY_MGMT_DPP, pkhash) < 0) {
                wpa_printf(MSG_ERROR, "DPP: Failed to add PMKSA cache entry");
@@ -2907,7 +2907,7 @@ hostapd_dpp_rx_priv_peer_intro_update(struct hostapd_data *hapd, const u8 *src,
        else
                expiration = 0;
 
-       if (wpa_auth_pmksa_add3(hapd->wpa_auth, src, intro.pmk, intro.pmk_len,
+       if (wpa_auth_pmksa_add2(hapd->wpa_auth, src, intro.pmk, intro.pmk_len,
                                intro.pmkid, expiration,
                                WPA_KEY_MGMT_DPP, pkhash) < 0) {
                wpa_printf(MSG_ERROR, "DPP: Failed to add PMKSA cache entry");

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 40dda80aab7c8c39ced88d58e983ab6134558dbe..701acaffd80197efab43f47ccf842e4acf593e81 100644 (file)
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -2154,7 +2154,8 @@ prepare_auth_resp_fils(struct hostapd_data *hapd,
                                    pmk, pmk_len,
                                    sta->fils_erp_pmkid,
                                    session_timeout,
-                                   wpa_auth_sta_key_mgmt(sta->wpa_sm)) < 0) {
+                                   wpa_auth_sta_key_mgmt(sta->wpa_sm),
+                                   NULL) < 0) {
                                wpa_printf(MSG_ERROR,
                                           "FILS: Failed to add PMKSA cache entry based on ERP");
                        }
@@ -3660,7 +3661,7 @@ static u16 owe_process_assoc_req(struct hostapd_data *hapd,
        wpa_hexdump_key(MSG_DEBUG, "OWE: PMK", sta->owe_pmk, sta->owe_pmk_len);
        wpa_hexdump(MSG_DEBUG, "OWE: PMKID", pmkid, PMKID_LEN);
        wpa_auth_pmksa_add2(hapd->wpa_auth, sta->addr, sta->owe_pmk,
-                           sta->owe_pmk_len, pmkid, 0, WPA_KEY_MGMT_OWE);
+                           sta->owe_pmk_len, pmkid, 0, WPA_KEY_MGMT_OWE, NULL);
 
        return WLAN_STATUS_SUCCESS;
 }

diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 1d41b2b91d9e136df7867f97b03cdeb3a3247ee6..69adcf3a5ed91e04dac7c998523c2afab1112dcd 100644 (file)
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -5734,29 +5734,12 @@ void wpa_auth_add_sae_pmkid(struct wpa_state_machine *sm, const u8 *pmkid)
 
 
 int wpa_auth_pmksa_add2(struct wpa_authenticator *wpa_auth, const u8 *addr,
-                       const u8 *pmk, size_t pmk_len, const u8 *pmkid,
-                       int session_timeout, int akmp)
-{
-       if (!wpa_auth || wpa_auth->conf.disable_pmksa_caching)
-               return -1;
-
-       wpa_hexdump_key(MSG_DEBUG, "RSN: Cache PMK (2)", pmk, PMK_LEN);
-       if (pmksa_cache_auth_add(wpa_auth->pmksa, pmk, pmk_len, pmkid,
-                                NULL, 0, wpa_auth->addr, addr, session_timeout,
-                                NULL, akmp))
-               return 0;
-
-       return -1;
-}
-
-
-int wpa_auth_pmksa_add3(struct wpa_authenticator *wpa_auth, const u8 *addr,
                        const u8 *pmk, size_t pmk_len, const u8 *pmkid,
                        int session_timeout, int akmp, const u8 *dpp_pkhash)
 {
        struct rsn_pmksa_cache_entry *entry;
 
-       if (wpa_auth->conf.disable_pmksa_caching)
+       if (!wpa_auth || wpa_auth->conf.disable_pmksa_caching)
                return -1;
 
        wpa_hexdump_key(MSG_DEBUG, "RSN: Cache PMK (3)", pmk, PMK_LEN);

diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
index 0b1ddf49cdddc85e5db2f6eb541ca16c9fb3bcfe..7e3dcbf3991feb3c6fc23a3ecd405e12c39c2643 100644 (file)
--- a/src/ap/wpa_auth.h
+++ b/src/ap/wpa_auth.h
@@ -481,9 +481,6 @@ int wpa_auth_pmksa_add_sae(struct wpa_authenticator *wpa_auth, const u8 *addr,
                           int akmp);
 void wpa_auth_add_sae_pmkid(struct wpa_state_machine *sm, const u8 *pmkid);
 int wpa_auth_pmksa_add2(struct wpa_authenticator *wpa_auth, const u8 *addr,
-                       const u8 *pmk, size_t pmk_len, const u8 *pmkid,
-                       int session_timeout, int akmp);
-int wpa_auth_pmksa_add3(struct wpa_authenticator *wpa_auth, const u8 *addr,
                        const u8 *pmk, size_t pmk_len, const u8 *pmkid,
                        int session_timeout, int akmp, const u8 *dpp_pkhash);
 void wpa_auth_pmksa_remove(struct wpa_authenticator *wpa_auth,