diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-03-15 01:31:53 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-03-15 01:31:53 +0000 |
| commit | 3a48e7e1e25f93425570b52bcfb00aeeb0f5b342 (patch) | |
| tree | 4fe050a0ce4a7eca41148c115ee2a3fec46835c6 /epan/crypt | |
| parent | fc6e505dacdc12792b5f2175f007715bfe3ce471 (diff) | |
Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
Needed to convert use of old IEEE802.11 preference strings to UAT. Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.
svn path=/trunk/; revision=48308
Diffstat (limited to 'epan/crypt')
| -rw-r--r-- | epan/crypt/airpdcap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index b047104a59..d79f80b35d 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -1989,18 +1989,17 @@ get_key_string(decryption_key_t* dk) switch(dk->type) { case AIRPDCAP_KEY_TYPE_WEP: - output_string = g_strdup_printf("%s:%s",STRING_KEY_TYPE_WEP,dk->key->str); + output_string = g_strdup(dk->key->str); break; case AIRPDCAP_KEY_TYPE_WPA_PWD: if(dk->ssid == NULL) - output_string = g_strdup_printf("%s:%s",STRING_KEY_TYPE_WPA_PWD,dk->key->str); + output_string = g_strdup(dk->key->str); else - output_string = g_strdup_printf("%s:%s:%s", - STRING_KEY_TYPE_WPA_PWD, dk->key->str, - format_uri(dk->ssid, ":")); + output_string = g_strdup_printf("%s:%s", + dk->key->str, format_uri(dk->ssid, ":")); break; case AIRPDCAP_KEY_TYPE_WPA_PMK: - output_string = g_strdup_printf("%s:%s",STRING_KEY_TYPE_WPA_PSK,dk->key->str); + output_string = g_strdup(dk->key->str); break; default: return NULL; |