diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-20 14:11:29 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-01 01:26:39 +0000 |
| commit | cbf89c8ed842a58c282872cf8c42adf9b8b2ffee (patch) | |
| tree | 3a0c338486818e511d8b9f27b0d16b3b213bcf9d /epan/dissectors/packet-ieee80211.c | |
| parent | 9887cd7feb7c377a3d046b924fe86907479be413 (diff) | |
| download | wireshark-cbf89c8ed842a58c282872cf8c42adf9b8b2ffee.tar.gz | |
Check preference titles and descriptions.
When registering preferences, make sure our titles and descriptions are
valid UTF-8. Make sure our titles are short and only contain printable
characters.
Fix problematic titles and descriptions.
Change-Id: I20d3f93438f2b3c30266f934297feb79897f2ee5
Reviewed-on: https://code.wireshark.org/review/18998
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 5707251f07..f83929328b 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -27420,14 +27420,6 @@ proto_register_ieee80211(void) "Enable decryption", "Enable WEP and WPA/WPA2 decryption", &enable_decryption); - prefs_register_static_text_preference(wlan_module, "info_decryption_key", - "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n" - "010203040506070809101111213 (104/128-bit WEP),\n" - "MyPassword[:MyAP] (WPA + plaintext password [+ SSID]),\n" - "0102030405...6061626364 (WPA + 256-bit key). " - "Invalid keys will be ignored.", - "Valid key formats"); - wep_uat = uat_new("WEP and WPA Decryption Keys", sizeof(uat_wep_key_record_t), /* record size */ "80211_keys", /* filename */ @@ -27435,7 +27427,7 @@ proto_register_ieee80211(void) &uat_wep_key_records, /* data_ptr */ &num_wepkeys_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ - NULL, /* help */ + NULL, /* help. XXX Needs chapter in WSUG */ uat_wep_key_record_copy_cb, /* copy callback */ uat_wep_key_record_update_cb, /* update callback */ uat_wep_key_record_free_cb, /* free callback */ @@ -27444,8 +27436,13 @@ proto_register_ieee80211(void) prefs_register_uat_preference(wlan_module, "wep_key_table", - "Decryption Keys", - "WEP and pre-shared WPA keys", + "Decryption keys", + "WEP and pre-shared WPA keys\n" + "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n" + "010203040506070809101111213 (104/128-bit WEP),\n" + "MyPassword[:MyAP] (WPA + plaintext password [+ SSID]),\n" + "0102030405...6061626364 (WPA + 256-bit key)." + "Invalid keys will be ignored.", wep_uat); } |