parent
4ce630cead
commit
797c140887
|
@ -527,7 +527,7 @@ static guint16
|
|||
de_auth_param_rand(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
|
||||
{
|
||||
/* The RAND value is 16 octets long */
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_rand, tvb, offset, 16, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_rand, tvb, offset, 16, ENC_NA);
|
||||
|
||||
/* no length check possible */
|
||||
return(16);
|
||||
|
@ -542,14 +542,14 @@ de_auth_param_autn(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
item = proto_tree_add_item(tree, hf_gsm_a_dtap_autn, tvb, offset, len, ENC_BIG_ENDIAN);
|
||||
item = proto_tree_add_item(tree, hf_gsm_a_dtap_autn, tvb, offset, len, ENC_NA);
|
||||
subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_AUTH_PARAM_AUTN]);
|
||||
|
||||
if(len == 16)
|
||||
{
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_sqn_xor_ak, tvb, offset, 6, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_amf, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_mac, tvb, offset + 8, 8, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_sqn_xor_ak, tvb, offset, 6, ENC_NA);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_amf, tvb, offset + 6, 2, ENC_NA);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_autn_mac, tvb, offset + 8, 8, ENC_NA);
|
||||
}
|
||||
else
|
||||
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_WARN,
|
||||
|
@ -565,7 +565,7 @@ static guint16
|
|||
de_auth_resp_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
|
||||
{
|
||||
/* This IE contains either the SRES or the 4 most significant octets of the RES */
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_sres, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_sres, tvb, offset, 4, ENC_NA);
|
||||
|
||||
/* no length check possible */
|
||||
return(4);
|
||||
|
@ -578,7 +578,7 @@ static guint16
|
|||
de_auth_resp_param_ext(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
|
||||
{
|
||||
/* This IE contains all but 4 most significant octets of RES */
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_xres, tvb, offset, len, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_a_dtap_xres, tvb, offset, len, ENC_NA);
|
||||
|
||||
return(len);
|
||||
}
|
||||
|
@ -592,13 +592,13 @@ de_auth_fail_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
item = proto_tree_add_item(tree, hf_gsm_a_dtap_auts, tvb, offset, len, ENC_BIG_ENDIAN);
|
||||
item = proto_tree_add_item(tree, hf_gsm_a_dtap_auts, tvb, offset, len, ENC_NA);
|
||||
subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_AUTH_FAIL_PARAM]);
|
||||
|
||||
if(len == 14)
|
||||
{
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_auts_sqn_ms_xor_ak, tvb, offset, 6, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_auts_mac_s, tvb, offset + 6, 8, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_auts_sqn_ms_xor_ak, tvb, offset, 6, ENC_NA);
|
||||
proto_tree_add_item(subtree, hf_gsm_a_dtap_auts_mac_s, tvb, offset + 6, 8, ENC_NA);
|
||||
}
|
||||
else
|
||||
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_WARN,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue