osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NAS 5GS: fix dissection of ngKSI in Registration Request message 

Bug: 16163
Change-Id: I00e5aa1f6e543eaf06d4c4f0e98c94eba80f5f6d
Reviewed-on: https://code.wireshark.org/review/34875
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-10-28 15:14:03 +01:00
parent c77471437f
commit 5fb897077e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-nas_5gs.c
View File

@ -3720,7 +3720,7 @@ typedef enum
DE_NAS_5GS_MM_LADN_INF, /* 9.11.3.30 LADN information */
DE_NAS_5GS_MM_MICO_IND, /* 9.11.3.31 MICO indication*/
DE_NAS_5GS_MM_NAS_KEY_SET_ID, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_KEY_SET_ID_H!, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_MSG_CONT, /* 9.11.3.33 NAS message container*/
DE_NAS_5GS_MM_NAS_SEC_ALGO, /* 9.11.3.34 NAS security algorithms*/
DE_NAS_5GS_MM_NW_NAME, /* 9.11.3.35 Network name*/
@ -4129,7 +4129,7 @@ nas_5gs_mm_registration_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
/* ngKSI NAS key set identifier 9.11.3.32 M V 1/2 H1*/
/* 5GS registration type 5GS registration type 9.11.3.7 M V 1/2 H0*/
ELEM_MAND_VV_SHORT(NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_NAS_KEY_SET_ID, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GS_REG_TYPE, ei_nas_5gs_missing_mandatory_elemen);
ELEM_MAND_VV_SHORT(NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GS_REG_TYPE, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, ei_nas_5gs_missing_mandatory_elemen);
/* Mobile identity 5GS mobile identity 9.11.3.4 M LV-E 6-n*/
ELEM_MAND_LV_E(NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GS_MOBILE_ID, NULL, ei_nas_5gs_missing_mandatory_elemen);