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/ap_config.c b/src/ap/ap_config.c
index 9611dc0..f9b6f29 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -131,15 +131,6 @@
 	 * This can be enabled by default once the implementation has been fully
 	 * completed and tested with other implementations. */
 	bss->tls_flags = TLS_CONN_DISABLE_TLSv1_3;
-
-	bss->send_probe_response = 1;
-
-#ifdef CONFIG_HS20
-	bss->hs20_release = (HS20_VERSION >> 4) + 1;
-#endif /* CONFIG_HS20 */
-
-	/* Default to strict CRL checking. */
-	bss->check_crl_strict = 1;
 }
 
 
@@ -202,6 +193,7 @@
 	conf->beacon_int = 100;
 	conf->rts_threshold = -1; /* use driver default: 2347 */
 	conf->fragm_threshold = -1; /* user driver default: 2346 */
+	conf->send_probe_response = 1;
 	/* Set to invalid value means do not add Power Constraint IE */
 	conf->local_pwr_constraint = -1;
 
@@ -241,9 +233,6 @@
 	 * environments for the current frequency band in the country. */
 	conf->country[2] = ' ';
 
-	conf->rssi_reject_assoc_rssi = 0;
-	conf->rssi_reject_assoc_timeout = 30;
-
 	return conf;
 }
 
@@ -259,12 +248,6 @@
 {
 	FILE *f;
 	char buf[128], *pos;
-	const char *keyid;
-	char *context;
-	char *context2;
-	char *token;
-	char *name;
-	char *value;
 	int line = 0, ret = 0, len, ok;
 	u8 addr[ETH_ALEN];
 	struct hostapd_wpa_psk *psk;
@@ -294,35 +277,9 @@
 		if (buf[0] == '\0')
 			continue;
 
-		context = NULL;
-		keyid = NULL;
-		while ((token = str_token(buf, " ", &context))) {
-			if (!os_strchr(token, '='))
-				break;
-			context2 = NULL;
-			name = str_token(token, "=", &context2);
-			value = str_token(token, "", &context2);
-			if (!value)
-				value = "";
-			if (!os_strcmp(name, "keyid")) {
-				keyid = value;
-			} else {
-				wpa_printf(MSG_ERROR,
-					   "Unrecognized '%s=%s' on line %d in '%s'",
-					   name, value, line, fname);
-				ret = -1;
-				break;
-			}
-		}
-
-		if (ret == -1)
-			break;
-
-		if (!token)
-			token = "";
-		if (hwaddr_aton(token, addr)) {
+		if (hwaddr_aton(buf, addr)) {
 			wpa_printf(MSG_ERROR, "Invalid MAC address '%s' on "
-				   "line %d in '%s'", token, line, fname);
+				   "line %d in '%s'", buf, line, fname);
 			ret = -1;
 			break;
 		}
@@ -338,14 +295,15 @@
 		else
 			os_memcpy(psk->addr, addr, ETH_ALEN);
 
-		pos = str_token(buf, "", &context);
-		if (!pos) {
+		pos = buf + 17;
+		if (*pos == '\0') {
 			wpa_printf(MSG_ERROR, "No PSK on line %d in '%s'",
 				   line, fname);
 			os_free(psk);
 			ret = -1;
 			break;
 		}
+		pos++;
 
 		ok = 0;
 		len = os_strlen(pos);
@@ -364,18 +322,6 @@
 			break;
 		}
 
-		if (keyid) {
-			len = os_strlcpy(psk->keyid, keyid, sizeof(psk->keyid));
-			if ((size_t) len >= sizeof(psk->keyid)) {
-				wpa_printf(MSG_ERROR,
-					   "PSK keyid too long on line %d in '%s'",
-					   line, fname);
-				os_free(psk);
-				ret = -1;
-				break;
-			}
-		}
-
 		psk->next = ssid->wpa_psk;
 		ssid->wpa_psk = psk;
 	}
@@ -592,7 +538,6 @@
 	os_free(conf->ocsp_stapling_response_multi);
 	os_free(conf->dh_file);
 	os_free(conf->openssl_ciphers);
-	os_free(conf->openssl_ecdh_curves);
 	os_free(conf->pac_opaque_encr_key);
 	os_free(conf->eap_fast_a_id);
 	os_free(conf->eap_fast_a_id_info);
@@ -699,7 +644,6 @@
 		os_free(conf->hs20_operator_icon);
 	}
 	os_free(conf->subscr_remediation_url);
-	os_free(conf->hs20_sim_provisioning_url);
 	os_free(conf->t_c_filename);
 	os_free(conf->t_c_server_url);
 #endif /* CONFIG_HS20 */
@@ -1059,15 +1003,6 @@
 	}
 #endif /* CONFIG_MBO */
 
-#ifdef CONFIG_OCV
-	if (full_config && bss->ieee80211w == NO_MGMT_FRAME_PROTECTION &&
-	    bss->ocv) {
-		wpa_printf(MSG_ERROR,
-			   "OCV: PMF needs to be enabled whenever using OCV");
-		return -1;
-	}
-#endif /* CONFIG_OCV */
-
 	return 0;
 }
 
@@ -1211,26 +1146,3 @@
 		}
 	}
 }
-
-
-int hostapd_sae_pw_id_in_use(struct hostapd_bss_config *conf)
-{
-	int with_id = 0, without_id = 0;
-	struct sae_password_entry *pw;
-
-	if (conf->ssid.wpa_passphrase)
-		without_id = 1;
-
-	for (pw = conf->sae_passwords; pw; pw = pw->next) {
-		if (pw->identifier)
-			with_id = 1;
-		else
-			without_id = 1;
-		if (with_id && without_id)
-			break;
-	}
-
-	if (with_id && !without_id)
-		return 2;
-	return with_id;
-}