diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-09-08 22:41:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-09-08 22:41:23 +0000 |
| commit | deb560618d6d54938d7a9fd21aba432ce40c17f7 (patch) | |
| tree | e4e59667aff92aa743e9455c66140b956e11bee6 /packet-kerberos.c | |
| parent | 0e5cdab1da07a58d1a3fb08a35c1437574165c68 (diff) | |
| download | wireshark-deb560618d6d54938d7a9fd21aba432ce40c17f7.tar.gz | |
KRB_DECODE_STRING_OR_DIE, and variants thereof, set "val_len" to the
length of the string value and "item_len" to the length of the entire
BER item, including the type header. As such, "val_len", not
"item_len", should be used when formatting the value, and "item_len",
not "val_len", should be used as the length when putting the item into
the protocol tree and when advancing the offset.
The kvno in an encryptedData item is unsigned; display it as such.
svn path=/trunk/; revision=6231
Diffstat (limited to 'packet-kerberos.c')
| -rw-r--r-- | packet-kerberos.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-kerberos.c b/packet-kerberos.c index 1d400777d9..93594e3e2e 100644 --- a/packet-kerberos.c +++ b/packet-kerberos.c @@ -5,7 +5,7 @@ * Richard Share (C) 2002, rsharpe@samba.org, modularized a bit more and * added AP-REQ and AP-REP dissection * - * $Id: packet-kerberos.c,v 1.33 2002/09/07 08:43:04 sharpe Exp $ + * $Id: packet-kerberos.c,v 1.34 2002/09/08 22:41:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1060,10 +1060,10 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int d KRB_DECODE_OCTET_STRING_OR_DIE("e-data", data, data_len, item_len); if (kerberos_tree) { - proto_tree_add_text(kerberos_tree, tvb, offset, data_len, - "Error Data: %s", bytes_to_str(data, item_len)); + proto_tree_add_text(kerberos_tree, tvb, offset, item_len, + "Error Data: %s", bytes_to_str(data, data_len)); } - offset += data_len; + offset += item_len; } break; @@ -1298,7 +1298,7 @@ dissect_EncryptedData(char *title, ASN1_SCK *asn1p, packet_info *pinfo, KRB_DECODE_UINT32_OR_DIE("kvno", val); if (encr_tree) { proto_tree_add_text(encr_tree, asn1p->tvb, offset, length, - "KVNO: %d", val); + "KVNO: %u", val); } offset += length; KRB_HEAD_DECODE_OR_DIE("cipher-wrap"); @@ -1308,10 +1308,10 @@ dissect_EncryptedData(char *title, ASN1_SCK *asn1p, packet_info *pinfo, KRB_DECODE_OCTET_STRING_OR_DIE("cipher", data, data_len, item_len); if (encr_tree) { - proto_tree_add_text(encr_tree, asn1p->tvb, offset, data_len, - "CipherText: %s", bytes_to_str(data, item_len)); + proto_tree_add_text(encr_tree, asn1p->tvb, offset, item_len, + "CipherText: %s", bytes_to_str(data, data_len)); } - offset += data_len; + offset += item_len; return offset - start_offset; } |