diff options
author | Gerald Combs <gerald@wireshark.org> | 2007-01-25 01:24:14 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2007-01-25 01:24:14 +0000 |
commit | 2664012ca6b9e2c8767263a9803151ad9dc46e13 (patch) | |
tree | c9d4f3c900f9bced64d3683613a76810e2e18b06 /epan/crypt | |
parent | 3696f686b1426f754826d539cfe726ca49b1debd (diff) |
Fix a key preference crash bug. Improve WPA passphrase and SSID length
handling. Free a byte array. Squelch a compiler warning. Fix a URI
string parsing bug.
svn path=/trunk/; revision=20549
Diffstat (limited to 'epan/crypt')
-rw-r--r-- | epan/crypt/airpdcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index d43bed4393..c6ed9a4dd0 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -854,7 +854,7 @@ INT AirPDcapRsna4WHandshake( /* -> not checked; the Supplicant will send another message 2 (hopefully!) */ /* now you can derive the PTK */ - for (key_index=0; key_index<(INT)ctx->keys_nr || sa->key!=NULL; key_index++) { + for (key_index=0; key_index<(INT)ctx->keys_nr || useCache; key_index++) { /* use the cached one, or try all keys */ if (!useCache) { AIRPDCAP_DEBUG_PRINT_LINE("AirPDcapRsna4WHandshake", "Try WPA key...", AIRPDCAP_DEBUG_LEVEL_3); @@ -1602,7 +1602,7 @@ parse_key_string(gchar* input_string) dk->type = AIRPDCAP_KEY_TYPE_WPA_PWD; dk->key = g_string_new(key); - dk->bits = 256; /* This is the lenght of the array pf bytes that will be generated using key+ssid ...*/ + dk->bits = 256; /* This is the length of the array pf bytes that will be generated using key+ssid ...*/ dk->ssid = byte_array_dup(ssid_ba); /* NULL if ssid_ba is NULL */ g_string_free(key_string, TRUE); |