diff options
| author | Darien Spencer <cusneud@mail.com> | 2017-09-15 18:47:32 +0300 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-20 10:38:01 +0000 |
| commit | eefec698611d7a982ce55eb7343df5e8eb0343c9 (patch) | |
| tree | 4104b4ff067ab898c44d4175e0c3436a314a58c8 /epan | |
| parent | e27870eaa6efa1c2dac08aa41a67fe9f0839e6e0 (diff) | |
UMTS RLC: Hide deciphering preference by default
Unless wireshark is compiled with a KASUMI implementation, trying to decipher RLC will always fail.
Change-Id: I0d44514579fbfcd21fe8c2b74c566c54f94e4698
Reviewed-on: https://code.wireshark.org/review/23557
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-umts_rlc.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c index a0d2f51c63..50289bc640 100644 --- a/epan/dissectors/packet-umts_rlc.c +++ b/epan/dissectors/packet-umts_rlc.c @@ -3084,21 +3084,31 @@ proto_register_rlc(void) "When enabled, RLC will assume all payloads in RLC frames are ciphered", &global_rlc_ciphered); +#ifdef HAVE_UMTS_KASUMI prefs_register_bool_preference(rlc_module, "try_decipher", "Try to decipher data", "When enabled, RLC will try to decipher data. (Experimental)", &global_rlc_try_decipher); + prefs_register_string_preference(rlc_module, "kasumi_key", + "KASUMI key", "Key for kasumi 32 characters long hex-string", &global_rlc_kasumi_key); +#else + /* If Wireshark isn't compiled with KASUMI we still want to register the above preferences + * We are doing so for two reasons: + * 1. To inform the user about the disabled preferences (using static text preference) + * 2. To prevent errors when Wireshark reads a preferences file which includes records for these preferences + */ + prefs_register_static_text_preference(rlc_module, "try_decipher", + "Data deciphering is disabled", "Wireshark was compiled without the KASUMI decryption algorithm"); + + prefs_register_obsolete_preference(rlc_module, "kasumi_key"); +#endif /* HAVE_UMTS_KASUMI */ + prefs_register_enum_preference(rlc_module, "li_size", "LI size", "LI size in bits, either 7 or 15 bit", &global_rlc_li_size, li_size_enumvals, FALSE); -#ifdef HAVE_UMTS_KASUMI - prefs_register_string_preference(rlc_module, "kasumi_key", - "KASUMI key", "Key for kasumi 32 characters long hex-string", &global_rlc_kasumi_key); -#endif /* HAVE_UMTS_KASUMI */ - register_init_routine(fragment_table_init); register_cleanup_routine(fragment_table_cleanup); } |