diff -wBNur wpa_supplicant-0.2.4/Makefile lnx_wpa_supplicant_1_2_0_0/Makefile --- wpa_supplicant-0.2.4/Makefile 2004-07-18 02:14:25.000000000 +0200 +++ lnx_wpa_supplicant_1_2_0_0/Makefile 2005-08-01 11:14:38.000000000 +0200 @@ -89,6 +94,12 @@ CONFIG_WIRELESS_EXTENSION=y endif +ifdef CONFIG_DRIVER_ZYDAS +CFLAGS += -DCONFIG_DRIVER_ZYDAS +OBJS += driver_zydas.o +CONFIG_WIRELESS_EXTENSION=y +endif + ifdef CONFIG_EAP_TLS # EAP-TLS CFLAGS += -DEAP_TLS diff -wBNur wpa_supplicant-0.2.4/wpa_supplicant.c lnx_wpa_supplicant_1_2_0_0/wpa_supplicant.c --- wpa_supplicant-0.2.4/wpa_supplicant.c 2004-07-18 02:03:46.000000000 +0200 +++ lnx_wpa_supplicant_1_2_0_0/wpa_supplicant.c 2005-08-01 11:14:37.000000000 +0200 @@ -1354,6 +1355,9 @@ /* driver_ndiswrapper.c */ extern struct wpa_driver_ops wpa_driver_ndiswrapper_ops; #endif /* CONFIG_DRIVER_NDISWRAPPER */ +#ifdef CONFIG_DRIVER_ZYDAS +extern struct wpa_driver_ops wpa_driver_zydas_ops; /* driver_zydas.c */ +#endif /* CONFIG_DRIVER_ZYDAS */ static int wpa_supplicant_set_driver(struct wpa_supplicant *wpa_s, const char *name) @@ -1377,6 +1381,8 @@ def_drv = &wpa_driver_wext_ops; #elif CONFIG_DRIVER_NDISWRAPPER def_drv = &wpa_driver_ndiswrapper_ops; +#elif CONFIG_DRIVER_ZYDAS + def_drv = &wpa_driver_zydas_ops; #else #error No driver support included in .config. #error See README for more information. @@ -1412,6 +1418,10 @@ else if (strcmp(name, "ndiswrapper") == 0) wpa_s->driver = &wpa_driver_ndiswrapper_ops; #endif /* CONFIG_DRIVER_NDISWRAPPER */ +#ifdef CONFIG_DRIVER_ZYDAS + else if (strcmp(name, "zydas") == 0) + wpa_s->driver = &wpa_driver_zydas_ops; +#endif /* CONFIG_DRIVER_ZYDAS */ else { printf("Unsupported driver '%s'.\n", name); return -1; @@ -1507,6 +1517,9 @@ #ifdef CONFIG_DRIVER_NDISWRAPPER " ndiswrapper = Linux ndiswrapper\n" #endif /* CONFIG_DRIVER_NDISWRAPER */ +#ifdef CONFIG_DRIVER_ZYDAS + " zydas = ZyDAS 802.11 driver (ZD1211)\n" +#endif /* CONFIG_DRIVER_ZYDAS */ "options:\n" " -B = run daemon in the background\n" " -d = increase debugging verbosity (-dd even more)\n" diff -wBNur wpa_supplicant-0.2.4/driver_zydas.c lnx_wpa_supplicant_1_2_0_0/driver_zydas.c --- wpa_supplicant-0.2.4/driver_zydas.c 1970-01-01 01:00:00.000000000 +0100 +++ lnx_wpa_supplicant_1_2_0_0/driver_zydas.c 2005-08-01 11:14:37.000000000 +0200 @@ -0,0 +1,444 @@ +/* + * WPA Supplicant - driver interaction with MADWIFI 802.11 driver + * Copyright (c) 2004, Sam Leffler + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#include +#include +#include +#include +#include +#include + +#include "common.h" +#include "driver.h" +#include "driver_wext.h" +#include "eloop.h" +#include "wpa_supplicant.h" +#include "zydas_common.h" + +#include +#include + +static int zydas_ioctl(const char *ifname, struct zydas_wlan_param *param, + int len, int show_err) +{ + int s; + struct iwreq iwr; + + s = socket(PF_INET, SOCK_DGRAM, 0); + if (s < 0) { + perror("socket"); + return -1; + } + memset(&iwr, 0, sizeof(iwr)); + strncpy(iwr.ifr_name, ifname, IFNAMSIZ); + iwr.u.data.pointer = (caddr_t) param; + iwr.u.data.length = len; + + if (ioctl(s, ZD_IOCTL_WPA, &iwr) < 0) { + int ret; + close(s); + ret = errno; + if (show_err) + perror("ioctl[ZD_IOCTL_WPA]"); + return ret; + } + close(s); + + return 0; +} + +static int +zydas_set_param(const char *ifname, int op, int arg, int show_err) +{ + struct iwreq iwr; + int *i, s, ret = 0; + + s = socket(PF_INET, SOCK_DGRAM, 0); + if (s < 0) { + perror("socket[PF_INET,SOCK_DGRAM]"); + return -1; + } + + memset(&iwr, 0, sizeof(iwr)); + strncpy(iwr.ifr_name, ifname, IFNAMSIZ); + i = (int *) iwr.u.name; + *i++ = op; + *i++ = arg; + + if (ioctl(s, ZD_IOCTL_PARAM, &iwr) < 0) { + perror("ioctl[ZD_IOCTL_PARAM]"); + ret = -1; + } + close(s); + + return ret; +} + +static int +getifflags(const char *ifname, int *flags) +{ + struct ifreq ifr; + int s; + + s = socket(PF_INET, SOCK_DGRAM, 0); + if (s < 0) { + perror("socket"); + return -1; + } + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) { + perror("SIOCGIFFLAGS"); + return errno; + } + *flags = ifr.ifr_flags & 0xffff; + return 0; +} + +static int +setifflags(const char *ifname, int flags) +{ + struct ifreq ifr; + int s; + + s = socket(PF_INET, SOCK_DGRAM, 0); + if (s < 0) { + perror("socket"); + return -1; + } + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + ifr.ifr_flags = flags & 0xffff; + if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) { + perror("SIOCSIFFLAGS"); + return errno; + } + return 0; +} + +static int +wpa_driver_zydas_set_wpa_ie(const char *ifname, + const char *wpa_ie, size_t wpa_ie_len) +{ + struct zydas_wlan_param *param; + int res; + size_t blen = ZD_GENERIC_ELEMENT_HDR_LEN + wpa_ie_len; + if (blen < sizeof(*param)) + blen = sizeof(*param); + + param = (struct zydas_wlan_param *) malloc(blen); + if (param == NULL) + return -1; + + memset(param, 0, blen); + param->cmd = ZD_CMD_SET_GENERIC_ELEMENT; + param->u.generic_elem.len = wpa_ie_len; + memcpy(param->u.generic_elem.data, wpa_ie, wpa_ie_len); + res = zydas_ioctl(ifname, param, blen, 1); + + free(param); + + return res; +} + +static int +wpa_driver_zydas_set_wpa(const char *ifname, int enabled) +{ + int ret = 0; + + wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled); + + if (!enabled && wpa_driver_zydas_set_wpa_ie(ifname, NULL, 0) < 0) + ret = -1; + if (zydas_set_param(ifname, ZD_PARAM_ROAMING, enabled, 1) < 0) + ret = -1; + if (zydas_set_param(ifname, ZD_PARAM_PRIVACY, enabled, 1) < 0) + ret = -1; + if (zydas_set_param(ifname, ZD_PARAM_WPA, enabled, 1) < 0) + ret = -1; + + return ret; +} + +static int +wpa_driver_zydas_set_key(const char *ifname, wpa_alg alg, + unsigned char *addr, int key_idx, + int set_tx, u8 *seq, size_t seq_len, + u8 *key, size_t key_len) +{ + struct zydas_wlan_param *param; + u8 *buf; + size_t blen; + int ret = 0; + char *alg_name; + + switch (alg) { + case WPA_ALG_NONE: + alg_name = "NONE"; + break; + case WPA_ALG_WEP: + alg_name = "WEP"; + break; + case WPA_ALG_TKIP: + alg_name = "TKIP"; + break; + case WPA_ALG_CCMP: + alg_name = "CCMP"; + break; + default: + return -1; + } + + wpa_printf(MSG_DEBUG, "%s: alg=%s key_idx=%d set_tx=%d seq_len=%d " + "key_len=%d", __FUNCTION__, alg_name, key_idx, set_tx, + seq_len, key_len); + + if (seq_len > 8) + return -2; + + blen = sizeof(*param) + key_len; + buf = malloc(blen); + if (buf == NULL) + return -1; + memset(buf, 0, blen); + + param = (struct zydas_wlan_param *) buf; + param->cmd = ZD_CMD_SET_ENCRYPT_KEY; + /* TODO: In theory, STA in client mode can use five keys; four default + * keys for receiving (with keyidx 0..3) and one individual key for + * both transmitting and receiving (keyidx 0) _unicast_ packets. Now, + * keyidx 0 is reserved for this unicast use and default keys can only + * use keyidx 1..3 (i.e., default key with keyidx 0 is not supported). + * This should be fine for more or less all cases, but for completeness + * sake, the driver could be enhanced to support the missing key. */ +#if 0 + if (addr == NULL) + memset(param->sta_addr, 0xff, ETH_ALEN); + else + memcpy(param->sta_addr, addr, ETH_ALEN); +#else + memset(param->sta_addr, 0xff, ETH_ALEN); +#endif + strncpy(param->u.crypt.alg, alg_name, ZD_CRYPT_ALG_NAME_LEN); + param->u.crypt.flags = set_tx ? ZD_FLAG_SET_TX_KEY : 0; + param->u.crypt.idx = key_idx; + memcpy(param->u.crypt.seq, seq, seq_len); + param->u.crypt.key_len = key_len; + memcpy((u8 *) param->u.crypt.key, key, key_len); + + /* Dump key context */ + if(alg == WPA_ALG_TKIP) { + int ii; + + wpa_printf(MSG_DEBUG, "Key Context:"); + for(ii = 0; ii < key_len; ) { + printf("0x%02x ", key[ii]); + + if((++ii % 16) == 0) + printf("\n"); + } + + printf("\n"); + } + + if (zydas_ioctl(ifname, param, blen, 1)) { + wpa_printf(MSG_WARNING, "Failed to set encryption."); + //show_set_key_error(param); + ret = -1; + } + free(buf); + + return ret; +} + +static int +wpa_driver_zydas_set_countermeasures(const char *ifname, int enabled) +{ + /* Enable the countermeasure */ + wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled); + return zydas_set_param(ifname, ZD_PARAM_COUNTERMEASURES, enabled, 1); +} + +static int +wpa_driver_zydas_set_drop_unencrypted(const char *ifname, int enabled) +{ + /* Enable the countermeasure */ + wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled); + return zydas_set_param(ifname, ZD_PARAM_DROPUNENCRYPTED, enabled, 1); +} + +static int +wpa_driver_zydas_deauthenticate(const char *ifname, u8 *addr, int reason_code) +{ + struct zydas_wlan_param *param; + int blen; + int ret; + + blen = sizeof(*param); + param = (struct zydas_wlan_param *) malloc(blen); + if (param == NULL) + return -1; + + memset(param, 0, blen); + param->cmd = ZD_CMD_SET_MLME; + param->u.mlme.cmd = MLME_STA_DEAUTH; + param->u.mlme.reason_code = reason_code; + memcpy(param->sta_addr, addr, ETH_ALEN); + ret = zydas_ioctl(ifname, param, blen, 1); + usleep(100000); + free(param); + return ret; +} + +static int +wpa_driver_zydas_disassociate(const char *ifname, u8 *addr, int reason_code) +{ + struct zydas_wlan_param *param; + int blen; + int ret; + + blen = sizeof(*param); + param = (struct zydas_wlan_param *) malloc(blen); + if (param == NULL) + return -1; + + memset(param, 0, blen); + param->cmd = ZD_CMD_SET_MLME; + param->u.mlme.cmd = MLME_STA_DISASSOC; + param->u.mlme.reason_code = reason_code; + memcpy(param->sta_addr, addr, ETH_ALEN); + ret = zydas_ioctl(ifname, param, blen, 1); + free(param); + return ret; +} + +static int +wpa_driver_zydas_associate(const char *ifname, const char *bssid, + const char *ssid, size_t ssid_len, + int freq, + const char *wpa_ie, size_t wpa_ie_len, + wpa_cipher pairwise_suite, + wpa_cipher group_suite, + wpa_key_mgmt key_mgmt_suite) +{ + int ret = 0; + + wpa_printf(MSG_DEBUG, "%s", __FUNCTION__); + + /* Because there might be the case, two or more APs with the same + * SSID, in order to identify them, we need to set the BSSID. */ + if (wpa_driver_zydas_set_wpa_ie(ifname, wpa_ie, wpa_ie_len) < 0) + ret = -1; + if (wpa_driver_wext_set_ssid(ifname, ssid, ssid_len) < 0) + ret = -1; + + // Mark for test + //if (wpa_driver_wext_set_bssid(ifname, bssid) < 0) + // ret = -1; + +#if 0 + /* Allow unencrypted EAPOL messages even if pairwise keys are set when + * not using WPA. IEEE 802.1X specifies that these frames are not + * encrypted, but WPA encrypts them when pairwise keys are in use. */ + if (key_mgmt_suite == KEY_MGMT_802_1X || + key_mgmt_suite == KEY_MGMT_PSK) + allow_unencrypted_eapol = 0; + else + allow_unencrypted_eapol = 1; + + if (prism2param(ifname, PRISM2_PARAM_IEEE_802_1X, + allow_unencrypted_eapol) < 0) { + wpa_printf(MSG_DEBUG, "hostap: Failed to configure " + "ieee_802_1x param"); + /* Ignore this error.. driver_hostap.c can also be used with + * other drivers that do not support this prism2_param. */ + } +#endif + + return ret; +} + +static int +wpa_driver_zydas_scan(const char *ifname, + void *ctx, u8 *ssid, size_t ssid_len) +{ + struct zydas_wlan_param param; + int ret; + + if (ssid == NULL) { + /* Use standard Linux Wireless Extensions ioctl if possible + * because some drivers using hostap code in wpa_supplicant + * might not support Host AP specific scan request (with SSID + * info). */ + return wpa_driver_wext_scan(ifname, ctx, ssid, ssid_len); + } + + if (ssid_len > 32) + ssid_len = 32; + + memset(¶m, 0, sizeof(param)); + param.cmd = ZD_CMD_SCAN_REQ; + param.u.scan_req.ssid_len = ssid_len; + memcpy(param.u.scan_req.ssid, ssid, ssid_len); + ret = zydas_ioctl(ifname, ¶m, sizeof(param), 1); + + /* Not all drivers generate "scan completed" wireless event, so try to + * read results after a timeout. */ + eloop_register_timeout(3, 0, wpa_driver_wext_scan_timeout, NULL, ctx); + + return ret; +} + +static int wpa_driver_zydas_set_auth_alg(const char *ifname, int auth_alg) +{ + int algs = 0; + + if (auth_alg & AUTH_ALG_OPEN_SYSTEM) + algs = 0; + if (auth_alg & AUTH_ALG_SHARED_KEY) + algs = 1; + + return zydas_set_param(ifname, ZD_PARAM_AUTH_ALGS, algs, 1); +} + +static void +wpa_driver_zydas_cleanup(const char *ifname) +{ + int flags; + + /* NB: mark interface down */ + if (getifflags(ifname, &flags) == 0) + (void) setifflags(ifname, flags &~ IFF_UP); +} + +struct wpa_driver_ops wpa_driver_zydas_ops = { + .get_bssid = wpa_driver_wext_get_bssid, + .get_ssid = wpa_driver_wext_get_ssid, + .set_wpa = wpa_driver_zydas_set_wpa, + .set_key = wpa_driver_zydas_set_key, + .events_init = wpa_driver_wext_events_init, + .events_deinit = wpa_driver_wext_events_deinit, + .set_countermeasures = wpa_driver_zydas_set_countermeasures, + .set_drop_unencrypted = wpa_driver_zydas_set_drop_unencrypted, + .scan = wpa_driver_zydas_scan, + .get_scan_results = wpa_driver_wext_get_scan_results, + .deauthenticate = wpa_driver_zydas_deauthenticate, + .disassociate = wpa_driver_zydas_disassociate, + .associate = wpa_driver_zydas_associate, + .set_auth_alg = wpa_driver_zydas_set_auth_alg, + .cleanup = wpa_driver_zydas_cleanup, +}; + diff -wBNur wpa_supplicant-0.2.4/zydas_common.h lnx_wpa_supplicant_1_2_0_0/zydas_common.h --- wpa_supplicant-0.2.4/zydas_common.h 1970-01-01 01:00:00.000000000 +0100 +++ lnx_wpa_supplicant_1_2_0_0/zydas_common.h 2005-08-01 11:14:37.000000000 +0200 @@ -0,0 +1,65 @@ +#ifndef ZYDAS_COMMON_H +#define ZYDAS_COMMON_H + +#define ZD_IOCTL_WPA (SIOCDEVPRIVATE + 1) +#define ZD_IOCTL_PARAM (SIOCDEVPRIVATE + 2) + +#define ZD_PARAM_ROAMING 0x0001 +#define ZD_PARAM_PRIVACY 0x0002 +#define ZD_PARAM_WPA 0x0003 +#define ZD_PARAM_COUNTERMEASURES 0x0004 +#define ZD_PARAM_DROPUNENCRYPTED 0x0005 +#define ZD_PARAM_AUTH_ALGS 0x0006 + +#define ZD_CMD_SET_ENCRYPT_KEY 0x0001 +#define ZD_CMD_SET_MLME 0x0002 +#define ZD_CMD_SCAN_REQ 0x0003 +#define ZD_CMD_SET_GENERIC_ELEMENT 0x0004 + +#define ZD_FLAG_SET_TX_KEY 0x0001 + +#define ZD_GENERIC_ELEMENT_HDR_LEN \ +((int) (&((struct zydas_wlan_param *) 0)->u.generic_elem.data)) + +#define ZD_CRYPT_ALG_NAME_LEN 16 +#define ZD_MAX_KEY_SIZE 32 +#define ZD_MAX_GENERIC_SIZE 64 + +/* structure definition */ + +struct zydas_wlan_param { + u32 cmd; + u8 sta_addr[ETH_ALEN]; + union { + struct { + u8 alg[ZD_CRYPT_ALG_NAME_LEN]; + u32 flags; + u32 err; + u8 idx; + u8 seq[8]; /* sequence counter (set: RX, get: TX) */ + u16 key_len; + u8 key[ZD_MAX_KEY_SIZE]; + } crypt; + struct { + u32 flags_and; + u32 flags_or; + } set_flags_sta; + struct { + u8 len; + u8 data[ZD_MAX_GENERIC_SIZE]; + } generic_elem; + struct { +#define MLME_STA_DEAUTH 0 +#define MLME_STA_DISASSOC 1 + u16 cmd; + u16 reason_code; + } mlme; + struct { + u8 ssid_len; + u8 ssid[32]; + } scan_req; + } u; +}; + +#endif +