Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d"
This reverts commit bbcc4391bed89e8cd0dd235760cd2983f65721cf.
Bug: 34869019
Test: Load image and start soft AP
Change-Id: I85f39c134c1321d6a78f9f25a34f71ad7b1173fb
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 69e3a5d..43e3558 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -75,8 +75,8 @@
static inline int wpa_auth_mic_failure_report(
struct wpa_authenticator *wpa_auth, const u8 *addr)
{
- if (wpa_auth->cb->mic_failure_report)
- return wpa_auth->cb->mic_failure_report(wpa_auth->cb_ctx, addr);
+ if (wpa_auth->cb.mic_failure_report)
+ return wpa_auth->cb.mic_failure_report(wpa_auth->cb.ctx, addr);
return 0;
}
@@ -84,8 +84,8 @@
static inline void wpa_auth_psk_failure_report(
struct wpa_authenticator *wpa_auth, const u8 *addr)
{
- if (wpa_auth->cb->psk_failure_report)
- wpa_auth->cb->psk_failure_report(wpa_auth->cb_ctx, addr);
+ if (wpa_auth->cb.psk_failure_report)
+ wpa_auth->cb.psk_failure_report(wpa_auth->cb.ctx, addr);
}
@@ -93,17 +93,17 @@
const u8 *addr, wpa_eapol_variable var,
int value)
{
- if (wpa_auth->cb->set_eapol)
- wpa_auth->cb->set_eapol(wpa_auth->cb_ctx, addr, var, value);
+ if (wpa_auth->cb.set_eapol)
+ wpa_auth->cb.set_eapol(wpa_auth->cb.ctx, addr, var, value);
}
static inline int wpa_auth_get_eapol(struct wpa_authenticator *wpa_auth,
const u8 *addr, wpa_eapol_variable var)
{
- if (wpa_auth->cb->get_eapol == NULL)
+ if (wpa_auth->cb.get_eapol == NULL)
return -1;
- return wpa_auth->cb->get_eapol(wpa_auth->cb_ctx, addr, var);
+ return wpa_auth->cb.get_eapol(wpa_auth->cb.ctx, addr, var);
}
@@ -112,19 +112,19 @@
const u8 *p2p_dev_addr,
const u8 *prev_psk)
{
- if (wpa_auth->cb->get_psk == NULL)
+ if (wpa_auth->cb.get_psk == NULL)
return NULL;
- return wpa_auth->cb->get_psk(wpa_auth->cb_ctx, addr, p2p_dev_addr,
- prev_psk);
+ return wpa_auth->cb.get_psk(wpa_auth->cb.ctx, addr, p2p_dev_addr,
+ prev_psk);
}
static inline int wpa_auth_get_msk(struct wpa_authenticator *wpa_auth,
const u8 *addr, u8 *msk, size_t *len)
{
- if (wpa_auth->cb->get_msk == NULL)
+ if (wpa_auth->cb.get_msk == NULL)
return -1;
- return wpa_auth->cb->get_msk(wpa_auth->cb_ctx, addr, msk, len);
+ return wpa_auth->cb.get_msk(wpa_auth->cb.ctx, addr, msk, len);
}
@@ -133,19 +133,19 @@
enum wpa_alg alg, const u8 *addr, int idx,
u8 *key, size_t key_len)
{
- if (wpa_auth->cb->set_key == NULL)
+ if (wpa_auth->cb.set_key == NULL)
return -1;
- return wpa_auth->cb->set_key(wpa_auth->cb_ctx, vlan_id, alg, addr, idx,
- key, key_len);
+ return wpa_auth->cb.set_key(wpa_auth->cb.ctx, vlan_id, alg, addr, idx,
+ key, key_len);
}
static inline int wpa_auth_get_seqnum(struct wpa_authenticator *wpa_auth,
const u8 *addr, int idx, u8 *seq)
{
- if (wpa_auth->cb->get_seqnum == NULL)
+ if (wpa_auth->cb.get_seqnum == NULL)
return -1;
- return wpa_auth->cb->get_seqnum(wpa_auth->cb_ctx, addr, idx, seq);
+ return wpa_auth->cb.get_seqnum(wpa_auth->cb.ctx, addr, idx, seq);
}
@@ -153,10 +153,10 @@
wpa_auth_send_eapol(struct wpa_authenticator *wpa_auth, const u8 *addr,
const u8 *data, size_t data_len, int encrypt)
{
- if (wpa_auth->cb->send_eapol == NULL)
+ if (wpa_auth->cb.send_eapol == NULL)
return -1;
- return wpa_auth->cb->send_eapol(wpa_auth->cb_ctx, addr, data, data_len,
- encrypt);
+ return wpa_auth->cb.send_eapol(wpa_auth->cb.ctx, addr, data, data_len,
+ encrypt);
}
@@ -164,9 +164,9 @@
static inline int wpa_auth_start_ampe(struct wpa_authenticator *wpa_auth,
const u8 *addr)
{
- if (wpa_auth->cb->start_ampe == NULL)
+ if (wpa_auth->cb.start_ampe == NULL)
return -1;
- return wpa_auth->cb->start_ampe(wpa_auth->cb_ctx, addr);
+ return wpa_auth->cb.start_ampe(wpa_auth->cb.ctx, addr);
}
#endif /* CONFIG_MESH */
@@ -175,9 +175,9 @@
int (*cb)(struct wpa_state_machine *sm, void *ctx),
void *cb_ctx)
{
- if (wpa_auth->cb->for_each_sta == NULL)
+ if (wpa_auth->cb.for_each_sta == NULL)
return 0;
- return wpa_auth->cb->for_each_sta(wpa_auth->cb_ctx, cb, cb_ctx);
+ return wpa_auth->cb.for_each_sta(wpa_auth->cb.ctx, cb, cb_ctx);
}
@@ -185,18 +185,18 @@
int (*cb)(struct wpa_authenticator *a, void *ctx),
void *cb_ctx)
{
- if (wpa_auth->cb->for_each_auth == NULL)
+ if (wpa_auth->cb.for_each_auth == NULL)
return 0;
- return wpa_auth->cb->for_each_auth(wpa_auth->cb_ctx, cb, cb_ctx);
+ return wpa_auth->cb.for_each_auth(wpa_auth->cb.ctx, cb, cb_ctx);
}
void wpa_auth_logger(struct wpa_authenticator *wpa_auth, const u8 *addr,
logger_level level, const char *txt)
{
- if (wpa_auth->cb->logger == NULL)
+ if (wpa_auth->cb.logger == NULL)
return;
- wpa_auth->cb->logger(wpa_auth->cb_ctx, addr, level, txt);
+ wpa_auth->cb.logger(wpa_auth->cb.ctx, addr, level, txt);
}
@@ -207,7 +207,7 @@
int maxlen;
va_list ap;
- if (wpa_auth->cb->logger == NULL)
+ if (wpa_auth->cb.logger == NULL)
return;
maxlen = os_strlen(fmt) + 100;
@@ -228,11 +228,11 @@
static void wpa_sta_disconnect(struct wpa_authenticator *wpa_auth,
const u8 *addr)
{
- if (wpa_auth->cb->disconnect == NULL)
+ if (wpa_auth->cb.disconnect == NULL)
return;
wpa_printf(MSG_DEBUG, "wpa_sta_disconnect STA " MACSTR, MAC2STR(addr));
- wpa_auth->cb->disconnect(wpa_auth->cb_ctx, addr,
- WLAN_REASON_PREV_AUTH_NOT_VALID);
+ wpa_auth->cb.disconnect(wpa_auth->cb.ctx, addr,
+ WLAN_REASON_PREV_AUTH_NOT_VALID);
}
@@ -416,8 +416,7 @@
*/
struct wpa_authenticator * wpa_init(const u8 *addr,
struct wpa_auth_config *conf,
- const struct wpa_auth_callbacks *cb,
- void *cb_ctx)
+ struct wpa_auth_callbacks *cb)
{
struct wpa_authenticator *wpa_auth;
@@ -426,8 +425,7 @@
return NULL;
os_memcpy(wpa_auth->addr, addr, ETH_ALEN);
os_memcpy(&wpa_auth->conf, conf, sizeof(*conf));
- wpa_auth->cb = cb;
- wpa_auth->cb_ctx = cb_ctx;
+ os_memcpy(&wpa_auth->cb, cb, sizeof(*cb));
if (wpa_auth_gen_wpa_ie(wpa_auth)) {
wpa_printf(MSG_ERROR, "Could not generate WPA IE.");
@@ -1951,7 +1949,7 @@
#endif /* CONFIG_IEEE80211R_AP */
} else {
wpa_printf(MSG_DEBUG, "WPA: Could not get PMK, get_msk: %p",
- sm->wpa_auth->cb->get_msk);
+ sm->wpa_auth->cb.get_msk);
sm->Disconnect = TRUE;
return;
}
@@ -3852,58 +3850,6 @@
}
-#ifdef CONFIG_PMKSA_CACHE_EXTERNAL
-#ifdef CONFIG_MESH
-
-int wpa_auth_pmksa_list_mesh(struct wpa_authenticator *wpa_auth, const u8 *addr,
- char *buf, size_t len)
-{
- if (!wpa_auth || !wpa_auth->pmksa)
- return 0;
-
- return pmksa_cache_auth_list_mesh(wpa_auth->pmksa, addr, buf, len);
-}
-
-
-struct rsn_pmksa_cache_entry *
-wpa_auth_pmksa_create_entry(const u8 *aa, const u8 *spa, const u8 *pmk,
- const u8 *pmkid, int expiration)
-{
- struct rsn_pmksa_cache_entry *entry;
- struct os_reltime now;
-
- entry = pmksa_cache_auth_create_entry(pmk, PMK_LEN, pmkid, NULL, 0, aa,
- spa, 0, NULL, WPA_KEY_MGMT_SAE);
- if (!entry)
- return NULL;
-
- os_get_reltime(&now);
- entry->expiration = now.sec + expiration;
- return entry;
-}
-
-
-int wpa_auth_pmksa_add_entry(struct wpa_authenticator *wpa_auth,
- struct rsn_pmksa_cache_entry *entry)
-{
- int ret;
-
- if (!wpa_auth || !wpa_auth->pmksa)
- return -1;
-
- ret = pmksa_cache_auth_add_entry(wpa_auth->pmksa, entry);
- if (ret < 0)
- wpa_printf(MSG_DEBUG,
- "RSN: Failed to store external PMKSA cache for "
- MACSTR, MAC2STR(entry->spa));
-
- return ret;
-}
-
-#endif /* CONFIG_MESH */
-#endif /* CONFIG_PMKSA_CACHE_EXTERNAL */
-
-
struct rsn_pmksa_cache_entry *
wpa_auth_pmksa_get(struct wpa_authenticator *wpa_auth, const u8 *sta_addr,
const u8 *pmkid)