diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-11-08 09:53:02 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-11-08 10:06:27 +0000 |
| commit | 22023c873d75c491cb850ab8c6f408f24ef2d93c (patch) | |
| tree | 1edb75b20a5249b78515134e1c4b6dafac18d8fd /epan/dissectors/packet-nas_eps.c | |
| parent | 2ab8e013cc5b5452fbfb8ec368722cfaf66008dd (diff) | |
NAS EPS: update ciphering heuristic check for 15 EPS bearers contexts
Change-Id: I8c413420f231a65121cf13df7bd28fe066b606a6
Reviewed-on: https://code.wireshark.org/review/30539
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 52167155c7..6bf23e9eef 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -6175,10 +6175,10 @@ get_nas_emm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf static const value_string nas_eps_esm_bearer_id_vals[] = { { 0x0, "No EPS bearer identity assigned"}, - { 0x1, "Reserved"}, - { 0x2, "Reserved"}, - { 0x3, "Reserved"}, - { 0x4, "Reserved"}, + { 0x1, "EPS bearer identity value 1"}, + { 0x2, "EPS bearer identity value 2"}, + { 0x3, "EPS bearer identity value 3"}, + { 0x4, "EPS bearer identity value 4"}, { 0x5, "EPS bearer identity value 5"}, { 0x6, "EPS bearer identity value 6"}, { 0x7, "EPS bearer identity value 7"}, @@ -6495,8 +6495,7 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* If pd is in plaintext this message probably isn't ciphered */ /* Use preferences settings to override this behavior */ if (!g_nas_eps_null_decipher || - ((pd != 7) && (pd != 15) && - (((pd&0x0f) != 2) || (((pd&0x0f) == 2) && ((pd&0xf0) > 0) && ((pd&0xf0) < 0x50))))) { + ((pd != 7) && (pd != 15) && ((pd&0x0f) != 2))) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Ciphered message"); proto_tree_add_item(nas_eps_tree, hf_nas_eps_ciphered_msg, tvb, offset, len-6, ENC_NA); return tvb_captured_length(tvb); |