aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-wai.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-wai.c')
-rw-r--r--epan/dissectors/packet-wai.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index 9f494281ce..613eb34e86 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -248,7 +248,7 @@ dissect_flag(tvbuff_t *tvb, guint offset, proto_tree *tree)
proto_item *flag_item;
proto_tree *flag_tree;
- flag_item = proto_tree_add_item(tree, hf_wai_flag, tvb, offset, 1, FALSE);
+ flag_item = proto_tree_add_item(tree, hf_wai_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
flag_tree = proto_item_add_subtree (flag_item, ett_wai_flags);
proto_tree_add_item (flag_tree, hf_wai_bk_rekeying_flag, tvb, offset, 1, FALSE);
@@ -334,8 +334,8 @@ dissect_identity(tvbuff_t * tvb, const guint16 offset, proto_tree * tree,
id_item = proto_tree_add_item(tree, hf_wai_identity, tvb, offset, length+4, ENC_NA);
id_tree = proto_item_add_subtree(id_item, ett_wai_identity);
proto_item_set_text(id_item, "%sIdentity", ((label==NULL)?"":label));
- proto_tree_add_item(id_tree, hf_wai_identity_id, tvb, offset, 2, FALSE);
- proto_tree_add_item(id_tree, hf_wai_identity_len, tvb, offset+2, 2, FALSE);
+ proto_tree_add_item(id_tree, hf_wai_identity_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(id_tree, hf_wai_identity_len, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(id_tree, hf_wai_identity_data, tvb, offset+4, length, ENC_NA);
return length + 4;
@@ -366,9 +366,9 @@ dissect_certificate(tvbuff_t * tvb, const gint offset, proto_tree * tree,
proto_item_set_text(certificate_item, "%sCertificate", ((label==NULL)?"":label));
certificate_tree = proto_item_add_subtree(certificate_item, ett_wai_certificate);
- id_item = proto_tree_add_item(certificate_tree, hf_wai_cert_id, tvb, offset, 2, FALSE);
+ id_item = proto_tree_add_item(certificate_tree, hf_wai_cert_id, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_item_set_text(id_item, "Certificate Identifier: %s (%#x)", id_name, id);
- proto_tree_add_item(certificate_tree, hf_wai_cert_len, tvb, offset+2, 2, FALSE);
+ proto_tree_add_item(certificate_tree, hf_wai_cert_len, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(certificate_tree, hf_wai_cert_data, tvb, offset+4, length, ENC_NA);
return length + 4;
@@ -396,9 +396,9 @@ dissect_ecdh_parameter(tvbuff_t * tvb, const gint offset, proto_tree * tree)
ecdh_item = proto_tree_add_item(tree, hf_wai_ecdh, tvb, offset, ecdh_len+3, ENC_NA);
ecdh_tree = proto_item_add_subtree(ecdh_item, ett_wai_ecdh_param);
- ecdh_id_item = proto_tree_add_item(ecdh_tree, hf_wai_ecdh_id, tvb, offset, 1, FALSE);
+ ecdh_id_item = proto_tree_add_item(ecdh_tree, hf_wai_ecdh_id, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_item_set_text(ecdh_id_item, "ID: %s (%#x)", id_name, ecdh_id);
- proto_tree_add_item(ecdh_tree, hf_wai_ecdh_len, tvb, offset+1, 2, FALSE);
+ proto_tree_add_item(ecdh_tree, hf_wai_ecdh_len, tvb, offset+1, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ecdh_tree, hf_wai_ecdh_content, tvb, offset+3, ecdh_len, ENC_NA);
return ecdh_len + 3;
@@ -428,7 +428,7 @@ dissect_key_data(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *con
key_data_item = proto_tree_add_item(tree, hf_wai_key_data, tvb, offset, length+1, ENC_NA);
proto_item_set_text(key_data_item, "%sKey Data", ((label==NULL)?"":label));
key_data_tree = proto_item_add_subtree(key_data_item, ett_wai_key_data);
- proto_tree_add_item(key_data_tree, hf_wai_key_data_len, tvb, offset, 1, FALSE);
+ proto_tree_add_item(key_data_tree, hf_wai_key_data_len, tvb, offset, 1, ENC_BIG_ENDIAN);
if (length > 0) {
proto_tree_add_item(key_data_tree, hf_wai_key_data_content, tvb, offset+1, length, ENC_NA);
@@ -449,9 +449,9 @@ dissect_multiple_certificate(tvbuff_t * tvb, guint offset, proto_tree *tree)
length = tvb_get_ntohs(tvb, offset+1);
multicert_item = proto_tree_add_item(tree, hf_wai_cert_ver, tvb, offset, length+3, ENC_NA);
multicert_tree = proto_item_add_subtree(multicert_item, ett_wai_certificate_verification);
- proto_tree_add_item(multicert_tree, hf_wai_type, tvb, offset, 1, FALSE);
+ proto_tree_add_item(multicert_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
- proto_tree_add_item(multicert_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(multicert_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
nonce_1_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA);
offset += 32;
@@ -459,10 +459,10 @@ dissect_multiple_certificate(tvbuff_t * tvb, guint offset, proto_tree *tree)
nonce_2_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA);
offset += 32;
proto_item_append_text(nonce_2_item, " 2");
- proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, FALSE);
+ proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
offset += dissect_certificate(tvb, offset, multicert_tree, "1 ");
- proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, FALSE);
+ proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
offset += dissect_certificate(tvb, offset, multicert_tree, "2 ");
@@ -481,13 +481,13 @@ dissect_identity_list(tvbuff_t *tvb, guint offset, proto_tree *tree)
length = tvb_get_ntohs(tvb, offset+1);
id_list_item = proto_tree_add_item(tree, hf_wai_identity_list, tvb, offset, length+3, ENC_NA);
id_list_tree = proto_item_add_subtree(id_list_item, ett_wai_identity_list);
- proto_tree_add_item(id_list_tree, hf_wai_type, tvb, offset, 1, FALSE);
+ proto_tree_add_item(id_list_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
- proto_tree_add_item(id_list_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(id_list_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(id_list_tree, hf_wai_reserved_byte, tvb, offset, 1, FALSE);
+ proto_tree_add_item(id_list_tree, hf_wai_reserved_byte, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
- proto_tree_add_item(id_list_tree, hf_wai_no_of_ids, tvb, offset, 2, FALSE);
+ proto_tree_add_item(id_list_tree, hf_wai_no_of_ids, tvb, offset, 2, ENC_BIG_ENDIAN);
no_of_ids = tvb_get_ntohs(tvb, offset);
offset += 2;
@@ -520,10 +520,10 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree)
sa_item = proto_tree_add_item(tree, hf_wai_sign_alg, tvb, offset, length+2, ENC_NA);
sa_tree = proto_item_add_subtree(sa_item, ett_wai_sign_alg);
- proto_tree_add_item(sa_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(sa_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- alg_name_item = proto_tree_add_item(sa_tree, hf_wai_hash_alg_id, tvb, offset, 1, FALSE);
+ alg_name_item = proto_tree_add_item(sa_tree, hf_wai_hash_alg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
alg_id = tvb_get_guint8(tvb, offset);
if (1 == alg_id) {
@@ -531,7 +531,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree)
}
offset += 1;
- sig_name_item = proto_tree_add_item(sa_tree, hf_wai_sign_alg_id, tvb, offset, 1, FALSE);
+ sig_name_item = proto_tree_add_item(sa_tree, hf_wai_sign_alg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
sig_id = tvb_get_guint8(tvb, offset);
if (1 == sig_id) {
@@ -544,7 +544,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree)
param_tree = proto_item_add_subtree(param_item, ett_wai_parameter);
proto_tree_add_item(param_tree, hf_wai_param_id, tvb, offset, 1, ENC_NA);
offset += 1;
- proto_tree_add_item(param_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(param_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(param_tree, hf_wai_param_content, tvb, offset, param_len, ENC_NA);
@@ -563,7 +563,7 @@ dissect_signature_value(tvbuff_t *tvb, guint offset, proto_tree *tree)
sv_item = proto_tree_add_item(tree, hf_wai_sign_val, tvb, offset, length+2, ENC_NA);
sv_tree = proto_item_add_subtree(sv_item, ett_wai_sign_val);
- proto_tree_add_item(sv_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(sv_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(sv_tree, hf_wai_sign_content, tvb, offset, length, ENC_NA);
@@ -584,10 +584,10 @@ dissect_signature(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *co
proto_item_set_text(ss_item, "%s", (label==NULL)?"Signature":label);
ss_tree = proto_item_add_subtree(ss_item, ett_wai_sign);
- proto_tree_add_item(ss_tree, hf_wai_type, tvb, offset, 1, FALSE);
+ proto_tree_add_item(ss_tree, hf_wai_type, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
- proto_tree_add_item(ss_tree, hf_wai_length, tvb, offset, 2, FALSE);
+ proto_tree_add_item(ss_tree, hf_wai_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
offset += dissect_identity(tvb, offset, ss_tree, NULL);
@@ -627,7 +627,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length
{
/* Chapter 8.1.4.5 STAKey Establishment procedure [ref: 1] */
dissect_flag(tvb, 0, data_tree);
- proto_tree_add_item(data_tree, hf_wai_sta_key_id, tvb, 1, 1, FALSE);
+ proto_tree_add_item(data_tree, hf_wai_sta_key_id, tvb, 1, 1, ENC_BIG_ENDIAN);
dissect_uskid(tvb, 2, data_tree);
dissect_addid(tvb, 3, data_tree);
dissect_counter(tvb, 15, data_tree);
@@ -685,7 +685,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length
offset++;
offset += dissect_challenge(tvb, offset, data_tree, "ASUE ");
offset += dissect_challenge(tvb, offset, data_tree, "AE ");
- proto_tree_add_item(data_tree, hf_wai_access_res, tvb, offset, 1, FALSE);
+ proto_tree_add_item(data_tree, hf_wai_access_res, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
offset += dissect_key_data(tvb, offset, data_tree, "ASUE ");
offset += dissect_key_data(tvb, offset, data_tree, "AE ");
@@ -869,14 +869,14 @@ Figure 18 from [ref:1]
wai_tree = proto_item_add_subtree(wai_item, ett_wai);
/* Field lengths and offsets in WAI protocol described above */
- proto_tree_add_item(wai_tree, hf_wai_version, tvb, 0, 2, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_type, tvb, 2, 1, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_subtype, tvb, 3, 1, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_reserved, tvb, 4, 2, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_length, tvb, 6,2, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_seq, tvb, 8, 2, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_fragm_seq, tvb, 10, 1, FALSE);
- proto_tree_add_item(wai_tree, hf_wai_flag, tvb, 11, 1, FALSE);
+ proto_tree_add_item(wai_tree, hf_wai_version, tvb, 0, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_type, tvb, 2, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_subtype, tvb, 3, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_reserved, tvb, 4, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_length, tvb, 6,2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_seq, tvb, 8, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_fragm_seq, tvb, 10, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(wai_tree, hf_wai_flag, tvb, 11, 1, ENC_BIG_ENDIAN);
}
frag_msg = fragment_add_seq_check (tvb, WAI_DATA_OFFSET, pinfo,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 10:14:08 +0000