aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssh.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-10-04 22:44:31 +0000
committerBill Meier <wmeier@newsguy.com>2011-10-04 22:44:31 +0000
commit94f36ca4ff177617fcc4e4ca8a171e374f8aeff6 (patch)
tree060bfcfb238455d21752efec8612998f2ab1db6f /epan/dissectors/packet-ssh.c
parent039fc59cb110aa485e910583d1edd5ff81ca2168 (diff)
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN svn path=/trunk/; revision=39260
Diffstat (limited to 'epan/dissectors/packet-ssh.c')
-rw-r--r--epan/dissectors/packet-ssh.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index d58e6f3137..5d7b639b2d 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -588,7 +588,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo,
/* payload */
if (ssh1_tree ) {
ssh_proto_tree_add_item(ssh1_tree, hf_ssh_payload,
- tvb, offset, len, FALSE);
+ tvb, offset, len, ENC_NA);
}
offset+=len;
@@ -741,13 +741,13 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
/* DH GEX Request (min/nbits/max) */
if (msg_code == 34) {
ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_min,
- tvb, offset, 4, FALSE);
+ tvb, offset, 4, ENC_NA);
offset+=4;
ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_nbits,
- tvb, offset, 4, FALSE);
+ tvb, offset, 4, ENC_NA);
offset+=4;
ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_max,
- tvb, offset, 4, FALSE);
+ tvb, offset, 4, ENC_NA);
offset+=4;
}
/* DH Key Exchange Reply (g/p) */
@@ -770,14 +770,14 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
len = plen+4-padding_length-(offset-last_offset);
if (tree ) {
ssh_proto_tree_add_item(key_ex_tree, hf_ssh_payload,
- tvb, offset, len, FALSE);
+ tvb, offset, len, ENC_NA);
}
offset +=len;
/* padding */
if(tree) {
ssh_proto_tree_add_item(key_ex_tree, hf_ssh_padding_string,
- tvb, offset, padding_length, FALSE);
+ tvb, offset, padding_length, ENC_NA);
}
offset+= padding_length;
@@ -787,7 +787,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
if(len == 16) {
if(tree) {
proto_tree_add_item(key_ex_tree, hf_ssh_mac_string,
- tvb, offset, len , FALSE);
+ tvb, offset, len , ENC_NA);
}
offset+=len;
}
@@ -814,12 +814,12 @@ ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
encrypted_len -= global_data->mac_length;
ssh_proto_tree_add_item(tree, hf_ssh_encrypted_packet,
- tvb, offset, encrypted_len, FALSE);
+ tvb, offset, encrypted_len, ENC_NA);
if (global_data && global_data->mac_length>0)
ssh_proto_tree_add_item(tree, hf_ssh_mac_string,
tvb, offset+encrypted_len,
- global_data->mac_length , FALSE);
+ global_data->mac_length , ENC_NA);
}
offset+=len;
return offset;
@@ -1016,7 +1016,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree,
tf=proto_tree_add_text(tree,tvb,offset,-1,"Algorithms");
key_init_tree = proto_item_add_subtree(tf, ett_key_init);
proto_tree_add_item(key_init_tree, hf_ssh_cookie,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_NA);
}
offset += 16;
@@ -1071,7 +1071,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree,
offset+=1;
ssh_proto_tree_add_item(key_init_tree, hf_ssh_kex_reserved,
- tvb, offset, 4, FALSE);
+ tvb, offset, 4, ENC_NA);
offset+=4;
if (tf != NULL) {