Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 8e2b48e..34969e7 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -13,7 +13,6 @@
#include "utils/state_machine.h"
#include "utils/bitfield.h"
#include "common/ieee802_11_defs.h"
-#include "common/ocv.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"
#include "crypto/aes_siv.h"
@@ -23,7 +22,6 @@
#include "crypto/sha384.h"
#include "crypto/random.h"
#include "eapol_auth/eapol_auth_sm.h"
-#include "drivers/driver.h"
#include "ap_config.h"
#include "ieee802_11.h"
#include "wpa_auth.h"
@@ -240,17 +238,6 @@
}
-#ifdef CONFIG_OCV
-static int wpa_channel_info(struct wpa_authenticator *wpa_auth,
- struct wpa_channel_info *ci)
-{
- if (!wpa_auth->cb->channel_info)
- return -1;
- return wpa_auth->cb->channel_info(wpa_auth->cb_ctx, ci);
-}
-#endif /* CONFIG_OCV */
-
-
static void wpa_rekey_gmk(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_authenticator *wpa_auth = eloop_ctx;
@@ -873,8 +860,6 @@
if (wpa_verify_key_mic(sm->wpa_key_mgmt, pmk_len, &PTK,
data, data_len) == 0) {
- os_memcpy(sm->PMK, pmk, pmk_len);
- sm->pmk_len = pmk_len;
ok = 1;
break;
}
@@ -2574,27 +2559,6 @@
wpabuf_put(plain, tmp2 - tmp);
*len = (u8 *) wpabuf_put(plain, 0) - len - 1;
-
-#ifdef CONFIG_OCV
- if (wpa_auth_uses_ocv(sm)) {
- struct wpa_channel_info ci;
- u8 *pos;
-
- if (wpa_channel_info(sm->wpa_auth, &ci) != 0) {
- wpa_printf(MSG_WARNING,
- "FILS: Failed to get channel info for OCI element");
- wpabuf_free(plain);
- return NULL;
- }
-
- pos = wpabuf_put(plain, OCV_OCI_EXTENDED_LEN);
- if (ocv_insert_extended_oci(&ci, pos) < 0) {
- wpabuf_free(plain);
- return NULL;
- }
- }
-#endif /* CONFIG_OCV */
-
return plain;
}
@@ -2660,21 +2624,6 @@
#endif /* CONFIG_FILS */
-#ifdef CONFIG_OCV
-int get_sta_tx_parameters(struct wpa_state_machine *sm, int ap_max_chanwidth,
- int ap_seg1_idx, int *bandwidth, int *seg1_idx)
-{
- struct wpa_authenticator *wpa_auth = sm->wpa_auth;
-
- if (!wpa_auth->cb->get_sta_tx_params)
- return -1;
- return wpa_auth->cb->get_sta_tx_params(wpa_auth->cb_ctx, sm->addr,
- ap_max_chanwidth, ap_seg1_idx,
- bandwidth, seg1_idx);
-}
-#endif /* CONFIG_OCV */
-
-
SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
{
struct wpa_authenticator *wpa_auth = sm->wpa_auth;
@@ -2726,8 +2675,6 @@
wpa_verify_key_mic(sm->wpa_key_mgmt, pmk_len, &PTK,
sm->last_rx_eapol_key,
sm->last_rx_eapol_key_len) == 0) {
- os_memcpy(sm->PMK, pmk, pmk_len);
- sm->pmk_len = pmk_len;
ok = 1;
break;
}
@@ -2799,32 +2746,6 @@
WLAN_REASON_PREV_AUTH_NOT_VALID);
return;
}
-#ifdef CONFIG_OCV
- if (wpa_auth_uses_ocv(sm)) {
- struct wpa_channel_info ci;
- int tx_chanwidth;
- int tx_seg1_idx;
-
- if (wpa_channel_info(wpa_auth, &ci) != 0) {
- wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,
- "Failed to get channel info to validate received OCI in EAPOL-Key 2/4");
- return;
- }
-
- if (get_sta_tx_parameters(sm,
- channel_width_to_int(ci.chanwidth),
- ci.seg1_idx, &tx_chanwidth,
- &tx_seg1_idx) < 0)
- return;
-
- if (ocv_verify_tx_params(kde.oci, kde.oci_len, &ci,
- tx_chanwidth, tx_seg1_idx) != 0) {
- wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,
- ocv_errorstr);
- return;
- }
- }
-#endif /* CONFIG_OCV */
#ifdef CONFIG_IEEE80211R_AP
if (ft && ft_check_msg_2_of_4(wpa_auth, sm, &kde) < 0) {
wpa_sta_disconnect(wpa_auth, sm->addr,
@@ -2962,36 +2883,6 @@
#endif /* CONFIG_IEEE80211W */
-static int ocv_oci_len(struct wpa_state_machine *sm)
-{
-#ifdef CONFIG_OCV
- if (wpa_auth_uses_ocv(sm))
- return OCV_OCI_KDE_LEN;
-#endif /* CONFIG_OCV */
- return 0;
-}
-
-static int ocv_oci_add(struct wpa_state_machine *sm, u8 **argpos)
-{
-#ifdef CONFIG_OCV
- struct wpa_channel_info ci;
-
- if (!wpa_auth_uses_ocv(sm))
- return 0;
-
- if (wpa_channel_info(sm->wpa_auth, &ci) != 0) {
- wpa_printf(MSG_WARNING,
- "Failed to get channel info for OCI element");
- return -1;
- }
-
- return ocv_insert_oci_kde(&ci, argpos);
-#else /* CONFIG_OCV */
- return 0;
-#endif /* CONFIG_OCV */
-}
-
-
SM_STATE(WPA_PTK, PTKINITNEGOTIATING)
{
u8 rsc[WPA_KEY_RSC_LEN], *_rsc, *gtk, *kde, *pos, dummy_gtk[32];
@@ -3075,7 +2966,7 @@
}
}
- kde_len = wpa_ie_len + ieee80211w_kde_len(sm) + ocv_oci_len(sm);
+ kde_len = wpa_ie_len + ieee80211w_kde_len(sm);
if (gtk)
kde_len += 2 + RSN_SELECTOR_LEN + 2 + gtk_len;
#ifdef CONFIG_IEEE80211R_AP
@@ -3120,10 +3011,6 @@
gtk, gtk_len);
}
pos = ieee80211w_kde_add(sm, pos);
- if (ocv_oci_add(sm, &pos) < 0) {
- os_free(kde);
- return;
- }
#ifdef CONFIG_IEEE80211R_AP
if (wpa_key_mgmt_ft(sm->wpa_key_mgmt)) {
@@ -3435,7 +3322,7 @@
}
if (sm->wpa == WPA_VERSION_WPA2) {
kde_len = 2 + RSN_SELECTOR_LEN + 2 + gsm->GTK_len +
- ieee80211w_kde_len(sm) + ocv_oci_len(sm);
+ ieee80211w_kde_len(sm);
kde_buf = os_malloc(kde_len);
if (kde_buf == NULL)
return;
@@ -3446,10 +3333,6 @@
pos = wpa_add_kde(pos, RSN_KEY_DATA_GROUPKEY, hdr, 2,
gtk, gsm->GTK_len);
pos = ieee80211w_kde_add(sm, pos);
- if (ocv_oci_add(sm, &pos) < 0) {
- os_free(kde_buf);
- return;
- }
kde_len = pos - kde;
} else {
kde = gtk;
@@ -3470,67 +3353,8 @@
SM_STATE(WPA_PTK_GROUP, REKEYESTABLISHED)
{
-#ifdef CONFIG_OCV
- struct wpa_authenticator *wpa_auth = sm->wpa_auth;
- const u8 *key_data, *mic;
- struct ieee802_1x_hdr *hdr;
- struct wpa_eapol_key *key;
- struct wpa_eapol_ie_parse kde;
- size_t mic_len;
- u16 key_data_length;
-#endif /* CONFIG_OCV */
-
SM_ENTRY_MA(WPA_PTK_GROUP, REKEYESTABLISHED, wpa_ptk_group);
sm->EAPOLKeyReceived = FALSE;
-
-#ifdef CONFIG_OCV
- mic_len = wpa_mic_len(sm->wpa_key_mgmt, sm->pmk_len);
-
- /*
- * Note: last_rx_eapol_key length fields have already been validated in
- * wpa_receive().
- */
- hdr = (struct ieee802_1x_hdr *) sm->last_rx_eapol_key;
- key = (struct wpa_eapol_key *) (hdr + 1);
- mic = (u8 *) (key + 1);
- key_data = mic + mic_len + 2;
- key_data_length = WPA_GET_BE16(mic + mic_len);
- if (key_data_length > sm->last_rx_eapol_key_len - sizeof(*hdr) -
- sizeof(*key) - mic_len - 2)
- return;
-
- if (wpa_parse_kde_ies(key_data, key_data_length, &kde) < 0) {
- wpa_auth_vlogger(wpa_auth, sm->addr, LOGGER_INFO,
- "received EAPOL-Key group msg 2/2 with invalid Key Data contents");
- return;
- }
-
- if (wpa_auth_uses_ocv(sm)) {
- struct wpa_channel_info ci;
- int tx_chanwidth;
- int tx_seg1_idx;
-
- if (wpa_channel_info(wpa_auth, &ci) != 0) {
- wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,
- "Failed to get channel info to validate received OCI in EAPOL-Key group 1/2");
- return;
- }
-
- if (get_sta_tx_parameters(sm,
- channel_width_to_int(ci.chanwidth),
- ci.seg1_idx, &tx_chanwidth,
- &tx_seg1_idx) < 0)
- return;
-
- if (ocv_verify_tx_params(kde.oci, kde.oci_len, &ci,
- tx_chanwidth, tx_seg1_idx) != 0) {
- wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,
- ocv_errorstr);
- return;
- }
- }
-#endif /* CONFIG_OCV */
-
if (sm->GUpdateStationKeys)
sm->group->GKeyDoneStations--;
sm->GUpdateStationKeys = FALSE;
@@ -4139,15 +3963,6 @@
}
-const u8 * wpa_auth_get_pmk(struct wpa_state_machine *sm, int *len)
-{
- if (!sm)
- return NULL;
- *len = sm->pmk_len;
- return sm->PMK;
-}
-
-
int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm)
{
if (sm == NULL)
@@ -4851,7 +4666,7 @@
}
}
- kde_len = wpa_ie_len + ieee80211w_kde_len(sm) + ocv_oci_len(sm);
+ kde_len = wpa_ie_len + ieee80211w_kde_len(sm);
if (gtk)
kde_len += 2 + RSN_SELECTOR_LEN + 2 + gtk_len;
#ifdef CONFIG_IEEE80211R_AP
@@ -4900,10 +4715,6 @@
os_memset(opos, 0, 6); /* clear PN */
}
#endif /* CONFIG_IEEE80211W */
- if (ocv_oci_add(sm, &pos) < 0) {
- os_free(kde);
- return -1;
- }
#ifdef CONFIG_IEEE80211R_AP
if (wpa_key_mgmt_ft(sm->wpa_key_mgmt)) {
@@ -4985,7 +4796,7 @@
gtk = gsm->GTK[gsm->GN - 1];
if (sm->wpa == WPA_VERSION_WPA2) {
kde_len = 2 + RSN_SELECTOR_LEN + 2 + gsm->GTK_len +
- ieee80211w_kde_len(sm) + ocv_oci_len(sm);
+ ieee80211w_kde_len(sm);
kde_buf = os_malloc(kde_len);
if (kde_buf == NULL)
return -1;
@@ -5005,10 +4816,6 @@
os_memset(opos, 0, 6); /* clear PN */
}
#endif /* CONFIG_IEEE80211W */
- if (ocv_oci_add(sm, &pos) < 0) {
- os_free(kde_buf);
- return -1;
- }
kde_len = pos - kde;
} else {
kde = gtk;