DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WPS: support WEP keys in hex characters format in received credentials

Browse source 
Attached patch makes wpa_supplicant support WEP keys in hex characters
format in received credentials from Registrars (tested with WRT610N).
This commit is contained in:
Andriy Tkachuk 2009-02-17 10:30:43 +02:00 committed by Jouni Malinen
parent 0632542b8b
commit 4b195a1bc9
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
wpa_supplicant/wps_supplicant.c
View file

@ -88,6 +88,7 @@ static int wpa_supplicant_wps_cred(void *ctx,
{ {
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
u8 key_idx;
if ((wpa_s->conf->wps_cred_processing == 1 || if ((wpa_s->conf->wps_cred_processing == 1 ||
wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) { wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) {
@ -151,13 +152,35 @@ static int wpa_supplicant_wps_cred(void *ctx,
case WPS_ENCR_NONE: case WPS_ENCR_NONE:
break; break;
case WPS_ENCR_WEP: case WPS_ENCR_WEP:
if (cred->key_len > 0 && cred->key_len <= MAX_WEP_KEY_LEN && if (cred->key_len <= 0)
cred->key_idx < NUM_WEP_KEYS) { break;
os_memcpy(ssid->wep_key[cred->key_idx], cred->key, if (cred->key_len != 5 && cred->key_len != 13 &&
cred->key_len); cred->key_len != 10 && cred->key_len != 26) {
ssid->wep_key_len[cred->key_idx] = cred->key_len; wpa_printf(MSG_ERROR, "WPS: Invalid WEP Key length "
ssid->wep_tx_keyidx = cred->key_idx; "%lu", (unsigned long) cred->key_len);
return -1;
} }
if (cred->key_idx >= NUM_WEP_KEYS) {
wpa_printf(MSG_ERROR, "WPS: Invalid WEP Key index %d",
cred->key_idx);
return -1;
}
key_idx = cred->key_idx;
if (cred->key_len == 10 || cred->key_len == 26) {
if (hexstr2bin((char *) cred->key,
ssid->wep_key[key_idx],
cred->key_len / 2) < 0) {
wpa_printf(MSG_ERROR, "WPS: Invalid WEP Key "
"%d", key_idx);
return -1;
}
ssid->wep_key_len[key_idx] = cred->key_len / 2;
} else {
os_memcpy(ssid->wep_key[key_idx], cred->key,
cred->key_len);
ssid->wep_key_len[key_idx] = cred->key_len;
}
ssid->wep_tx_keyidx = key_idx;
break; break;
case WPS_ENCR_TKIP: case WPS_ENCR_TKIP:
ssid->pairwise_cipher = WPA_CIPHER_TKIP; ssid->pairwise_cipher = WPA_CIPHER_TKIP;