diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-11-17 20:03:36 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-11-17 20:03:36 +0000 |
| commit | 71039b37c63ced1026b9c464e78a5d9b4cd283a2 (patch) | |
| tree | daaae3a5b6c191bb741cf1cf56ccd8877b2a950d /epan/dissectors/packet-nas_eps.c | |
| parent | 2aaa91c3fbe0af599d7aba2070d71cb9db801eb8 (diff) | |
Fix "With the current changes NAS messages with the "null ciphering algorithm" EEA0 are not handled."
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6348
svn path=/trunk/; revision=39911
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 8355c3a8f5..4de8c551d6 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -4552,24 +4552,13 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nas_eps_tree, hf_nas_eps_seq_no, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Integrity protected and ciphered = 2, Integrity protected and ciphered with new EPS security context = 4 */ - pd = tvb_get_guint8(tvb,offset)&0x0f; -#if 0 - /* Does not work see Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6348 - * 9.2 Protocol discriminator - * : - * The protocol discriminator in the header (see 3GPP TS 24.007 [12]) of a - * security protected NAS message is encoded as "EPS mobility management messages". - * XXX Should we check for PD == 7? - */ + /* Read security_header_type AND pd */ + pd = tvb_get_guint8(tvb,offset); /* If pd is in plaintext this message probably isn't ciphered */ if((pd!=7)&&(pd!=2)&&(pd!=15)){ proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); return; } -#else - proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); - return; -#endif }else{ /* msg_auth_code == 0, probably not ciphered */ /* Sequence number Sequence number 9.6 M V 1 */ |