Add test command for disabling/enabling A-MPDU aggregation

[libeap.git] / src / drivers / driver_ndis.c

diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index 1c71d78..ed00e98 100644 (file)
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -792,6 +792,25 @@ static int wpa_driver_ndis_scan(void *priv,
 }
 
 
+static const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
+{
+       const u8 *end, *pos;
+
+       pos = (const u8 *) (res + 1);
+       end = pos + res->ie_len;
+
+       while (pos + 1 < end) {
+               if (pos + 2 + pos[1] > end)
+                       break;
+               if (pos[0] == ie)
+                       return pos;
+               pos += 2 + pos[1];
+       }
+
+       return NULL;
+}
+
+
 static struct wpa_scan_res * wpa_driver_ndis_add_scan_ssid(
        struct wpa_scan_res *r, NDIS_802_11_SSID *ssid)
 {
@@ -970,8 +989,9 @@ static int wpa_driver_ndis_add_wep(struct wpa_driver_ndis_data *drv,
 }
 
 
-static int wpa_driver_ndis_set_key(const char *ifname, void *priv, wpa_alg alg,
-                                  const u8 *addr, int key_idx, int set_tx,
+static int wpa_driver_ndis_set_key(const char *ifname, void *priv,
+                                  enum wpa_alg alg, const u8 *addr,
+                                  int key_idx, int set_tx,
                                   const u8 *seq, size_t seq_len,
                                   const u8 *key, size_t key_len)
 {
@@ -1046,6 +1066,7 @@ wpa_driver_ndis_associate(void *priv,
 {
        struct wpa_driver_ndis_data *drv = priv;
        u32 auth_mode, encr, priv_mode, mode;
+       u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
        drv->mode = params->mode;
 
@@ -1071,7 +1092,6 @@ wpa_driver_ndis_associate(void *priv,
        if (params->key_mgmt_suite == KEY_MGMT_NONE ||
            params->key_mgmt_suite == KEY_MGMT_802_1X_NO_WPA) {
                /* Re-set WEP keys if static WEP configuration is used. */
-               u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
                int i;
                for (i = 0; i < 4; i++) {
                        if (!params->wep_key[i])
@@ -1087,8 +1107,8 @@ wpa_driver_ndis_associate(void *priv,
        }
 
        if (params->wpa_ie == NULL || params->wpa_ie_len == 0) {
-               if (params->auth_alg & AUTH_ALG_SHARED_KEY) {
-                       if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM)
+               if (params->auth_alg & WPA_AUTH_ALG_SHARED) {
+                       if (params->auth_alg & WPA_AUTH_ALG_OPEN)
                                auth_mode = Ndis802_11AuthModeAutoSwitch;
                        else
                                auth_mode = Ndis802_11AuthModeShared;
@@ -1105,6 +1125,22 @@ wpa_driver_ndis_associate(void *priv,
        } else if (params->key_mgmt_suite == KEY_MGMT_WPS) {
                auth_mode = Ndis802_11AuthModeOpen;
                priv_mode = Ndis802_11PrivFilterAcceptAll;
+               if (params->wps == WPS_MODE_PRIVACY) {
+                       u8 dummy_key[5] = { 0x11, 0x22, 0x33, 0x44, 0x55 };
+                       /*
+                        * Some NDIS drivers refuse to associate in open mode
+                        * configuration due to Privacy field mismatch, so use
+                        * a workaround to make the configuration look like
+                        * matching one for WPS provisioning.
+                        */
+                       wpa_printf(MSG_DEBUG, "NDIS: Set dummy WEP key as a "
+                                  "workaround to allow driver to associate "
+                                  "for WPS");
+                       wpa_driver_ndis_set_key(drv->ifname, drv, WPA_ALG_WEP,
+                                               bcast, 0, 1,
+                                               NULL, 0, dummy_key,
+                                               sizeof(dummy_key));
+               }
 #endif /* CONFIG_WPS */
        } else {
                priv_mode = Ndis802_11PrivFilter8021xWEP;
@@ -1128,6 +1164,12 @@ wpa_driver_ndis_associate(void *priv,
                encr = Ndis802_11Encryption1Enabled;
                break;
        case CIPHER_NONE:
+#ifdef CONFIG_WPS
+               if (params->wps == WPS_MODE_PRIVACY) {
+                       encr = Ndis802_11Encryption1Enabled;
+                       break;
+               }
+#endif /* CONFIG_WPS */
                if (params->group_suite == CIPHER_CCMP)
                        encr = Ndis802_11Encryption3Enabled;
                else if (params->group_suite == CIPHER_TKIP)
@@ -1136,7 +1178,14 @@ wpa_driver_ndis_associate(void *priv,
                        encr = Ndis802_11EncryptionDisabled;
                break;
        default:
+#ifdef CONFIG_WPS
+               if (params->wps == WPS_MODE_PRIVACY) {
+                       encr = Ndis802_11Encryption1Enabled;
+                       break;
+               }
+#endif /* CONFIG_WPS */
                encr = Ndis802_11EncryptionDisabled;
+               break;
        };
 
        if (ndis_set_oid(drv, OID_802_11_PRIVACY_FILTER,
@@ -3211,7 +3260,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
        NULL /* set_ieee8021x */,
        NULL /* set_privacy */,
        NULL /* get_seqnum */,
-       NULL /* get_seqnum_igtk */,
        NULL /* flush */,
        NULL /* set_generic_elem */,
        NULL /* read_sta_data */,
@@ -3243,7 +3291,22 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
        NULL /* set_radius_acl_auth */,
        NULL /* set_radius_acl_expire */,
        NULL /* set_ht_params */,
-       NULL /* set_wps_beacon_ie */,
-       NULL /* set_wps_probe_resp_ie */,
-       NULL /* set_supp_port */
+       NULL /* set_ap_wps_ie */,
+       NULL /* set_supp_port */,
+       NULL /* set_wds_sta */,
+       NULL /* send_action */,
+       NULL /* remain_on_channel */,
+       NULL /* cancel_remain_on_channel */,
+       NULL /* probe_req_report */,
+       NULL /* disable_11b_rates */,
+       NULL /* deinit_ap */,
+       NULL /* suspend */,
+       NULL /* resume */,
+       NULL /* signal_monitor */,
+       NULL /* send_frame */,
+       NULL /* shared_freq */,
+       NULL /* get_noa */,
+       NULL /* set_noa */,
+       NULL /* set_p2p_powersave */,
+       NULL /* ampdu */
 };