diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-07-04 14:07:20 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-07-04 14:07:20 +0000 |
| commit | 639e59a9f90f1f0dc4f673f8b1f37c9d64b84834 (patch) | |
| tree | b72a5b7d6be3d8e4e5edc594582ce11cd2bcd512 /epan/crypt/airpdcap_user.h | |
| parent | 509c6a7fc070c271ce520739464e22e18e320bb1 (diff) | |
From Michael Mann:
Removed "key prefix" need within GUI so it's a little more intuitive (because
that's what this bug is complaining about). Slight backwards compatibility
issue with UAT (because key prefix was in previous keys), but all development
(including fix for BUG 1123 that created UAT) has just been on SVN and not
released.
Also adjusted AirPCap (airpcap_loader.c) to account for the lack of "key
prefix".
Addressed some memory leaks/excess string creation.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5985
svn path=/trunk/; revision=37888
Diffstat (limited to 'epan/crypt/airpdcap_user.h')
| -rw-r--r-- | epan/crypt/airpdcap_user.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/crypt/airpdcap_user.h b/epan/crypt/airpdcap_user.h index 1d5e2663c9..1b4836ea80 100644 --- a/epan/crypt/airpdcap_user.h +++ b/epan/crypt/airpdcap_user.h @@ -204,17 +204,20 @@ typedef struct _AIRPDCAP_KEYS_COLLECTION { * - 01:02:03:04:05 (40/64-bit WEP) * - 0102030405060708090a0b0c0d (104/128-bit WEP) * - 01:02:03:04:05:06:07:08:09:0a:0b:0c:0d (104/128-bit WEP) - * - wep:01020304... (WEP) - * - wep:01:02:03:04... (WEP) - * - wpa-pwd:MyPassword (WPA + plaintext password + "wildcard" SSID) - * - wpa-pwd:MyPassword:MySSID (WPA + plaintext password + specific SSID) - * - wpa-psk:01020304... (WPA + 256-bit raw key) + * - MyPassword (WPA + plaintext password + "wildcard" SSID) + * - MyPassword:MySSID (WPA + plaintext password + specific SSID) + * - 01020304... (WPA + 256-bit raw key) + * @param key_type [IN] Type of key used for string. Possibilities include: + * - AIRPDCAP_KEY_TYPE_WEP (40/64-bit and 104/128-bit WEP) + * - AIRPDCAP_KEY_TYPE_WPA_PWD (WPA + plaintext password + "wildcard" SSID or + * WPA + plaintext password + specific SSID) + * - AIRPDCAP_KEY_TYPE_WPA_PSK (WPA + 256-bit raw key) * @return A pointer to a freshly-g_malloc()ed decryption_key_t struct on * success, or NULL on failure. * @see get_key_string() */ decryption_key_t* -parse_key_string(gchar* key_string); +parse_key_string(gchar* key_string, guint8 key_type); /** * Returns a newly allocated string representing the given decryption_key_t |