diff options
Diffstat (limited to 'wpa_supplicant/ctrl_iface.c')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 541de758..7301d50f 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -747,8 +747,6 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s, break; pos++; } - } else if (os_strcasecmp(cmd, "ft_rsnxe_used") == 0) { - wpa_s->ft_rsnxe_used = atoi(value); } else if (os_strcasecmp(cmd, "rsne_override_eapol") == 0) { wpabuf_free(wpa_s->rsne_override_eapol); if (os_strcmp(value, "NULL") == 0) @@ -3959,9 +3957,7 @@ static const struct cipher_info ciphers[] = { { WPA_DRIVER_CAPA_ENC_GCMP_256, "GCMP-256", 0 }, { WPA_DRIVER_CAPA_ENC_CCMP, "CCMP", 0 }, { WPA_DRIVER_CAPA_ENC_GCMP, "GCMP", 0 }, -#ifndef CONFIG_NO_TKIP { WPA_DRIVER_CAPA_ENC_TKIP, "TKIP", 0 }, -#endif /* CONFIG_NO_TKIP */ { WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE, "NONE", 0 }, #ifdef CONFIG_WEP { WPA_DRIVER_CAPA_ENC_WEP104, "WEP104", 1 }, @@ -3992,11 +3988,7 @@ static int ctrl_iface_get_capability_pairwise(int res, char *strict, if (res < 0) { if (strict) return 0; -#ifdef CONFIG_NO_TKIP - len = os_strlcpy(buf, "CCMP NONE", buflen); -#else /* CONFIG_NO_TKIP */ len = os_strlcpy(buf, "CCMP TKIP NONE", buflen); -#endif /* CONFIG_NO_TKIP */ if (len >= buflen) return -1; return len; @@ -4033,17 +4025,9 @@ static int ctrl_iface_get_capability_group(int res, char *strict, if (strict) return 0; #ifdef CONFIG_WEP -#ifdef CONFIG_NO_TKIP - len = os_strlcpy(buf, "CCMP WEP104 WEP40", buflen); -#else /* CONFIG_NO_TKIP */ len = os_strlcpy(buf, "CCMP TKIP WEP104 WEP40", buflen); -#endif /* CONFIG_NO_TKIP */ #else /* CONFIG_WEP */ -#ifdef CONFIG_NO_TKIP - len = os_strlcpy(buf, "CCMP", buflen); -#else /* CONFIG_NO_TKIP */ len = os_strlcpy(buf, "CCMP TKIP", buflen); -#endif /* CONFIG_NO_TKIP */ #endif /* CONFIG_WEP */ if (len >= buflen) return -1; @@ -7960,34 +7944,6 @@ static int wpas_ctrl_iface_driver_flags(struct wpa_supplicant *wpa_s, } -static int wpas_ctrl_iface_driver_flags2(struct wpa_supplicant *wpa_s, - char *buf, size_t buflen) -{ - int ret, i; - char *pos, *end; - - ret = os_snprintf(buf, buflen, "%016llX:\n", - (long long unsigned) wpa_s->drv_flags2); - if (os_snprintf_error(buflen, ret)) - return -1; - - pos = buf + ret; - end = buf + buflen; - - for (i = 0; i < 64; i++) { - if (wpa_s->drv_flags2 & (1LLU << i)) { - ret = os_snprintf(pos, end - pos, "%s\n", - driver_flag2_to_string(1LLU << i)); - if (os_snprintf_error(end - pos, ret)) - return -1; - pos += ret; - } - } - - return pos - buf; -} - - static int wpa_supplicant_pktcnt_poll(struct wpa_supplicant *wpa_s, char *buf, size_t buflen) { @@ -8228,7 +8184,6 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s) wpa_s->disable_sa_query = 0; wpa_s->testing_resend_assoc = 0; wpa_s->ignore_sae_h2e_only = 0; - wpa_s->ft_rsnxe_used = 0; wpa_s->reject_btm_req_reason = 0; wpa_sm_set_test_assoc_ie(wpa_s->wpa, NULL); os_free(wpa_s->get_pref_freq_list_override); @@ -10758,9 +10713,6 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s, } else if (os_strcmp(buf, "DRIVER_FLAGS") == 0) { reply_len = wpas_ctrl_iface_driver_flags(wpa_s, reply, reply_size); - } else if (os_strcmp(buf, "DRIVER_FLAGS2") == 0) { - reply_len = wpas_ctrl_iface_driver_flags2(wpa_s, reply, - reply_size); #ifdef ANDROID } else if (os_strncmp(buf, "DRIVER ", 7) == 0) { reply_len = wpa_supplicant_driver_cmd(wpa_s, buf + 7, reply, |