osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

minor update, add an extra parameter to a call to prepare for decryption of GSSAPI wrapped data 

svn path=/trunk/; revision=13642
This commit is contained in:
Ronnie Sahlberg 2005-03-06 22:52:58 +00:00
parent 26dd060797
commit 7a43aeb457
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-spnego.c
View File

@ -226,7 +226,7 @@ static const value_string spnego_krb5_seal_alg_vals[] = {
static int static int
dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); dissect_spnego_krb5_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
static int static int
dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint16 token_id);
static void static void
dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -383,7 +383,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break; break;
case KRB_TOKEN_WRAP: case KRB_TOKEN_WRAP:
offset = dissect_spnego_krb5_wrap_base(tvb, offset, pinfo, subtree); offset = dissect_spnego_krb5_wrap_base(tvb, offset, pinfo, subtree, token_id);
break; break;
case KRB_TOKEN_DELETE_SEC_CONTEXT: case KRB_TOKEN_DELETE_SEC_CONTEXT:
@ -403,7 +403,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* XXX - This is for GSSAPI Wrap tokens ... * XXX - This is for GSSAPI Wrap tokens ...
*/ */
static int static int
dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 _U_ token_id)
{ {
guint16 sgn_alg; guint16 sgn_alg;
@ -463,6 +463,9 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
* the data we're wrapped around starts. Also, set the length * the data we're wrapped around starts. Also, set the length
* of our top-level item to that offset, so it doesn't cover * of our top-level item to that offset, so it doesn't cover
* the data we're wrapped around. * the data we're wrapped around.
*
* Note that for DCERPC the GSSAPI blobs comes after the data it wraps,
* not before.
*/ */
return offset; return offset;
} }
@ -544,6 +547,7 @@ dissect_spnego_krb5_wrap(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
proto_item *item; proto_item *item;
proto_tree *subtree; proto_tree *subtree;
int offset = 0; int offset = 0;
guint16 token_id;
item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, FALSE); item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, 0, -1, FALSE);
@ -557,12 +561,13 @@ dissect_spnego_krb5_wrap(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
/* First, the token ID ... */ /* First, the token ID ... */
token_id = tvb_get_letohs(tvb, offset);
proto_tree_add_item(subtree, hf_spnego_krb5_tok_id, tvb, offset, 2, proto_tree_add_item(subtree, hf_spnego_krb5_tok_id, tvb, offset, 2,
TRUE); TRUE);
offset += 2; offset += 2;
offset = dissect_spnego_krb5_wrap_base(tvb, offset, pinfo, subtree); offset = dissect_spnego_krb5_wrap_base(tvb, offset, pinfo, subtree, token_id);
/* /*
* Return the offset past the checksum, so that we know where * Return the offset past the checksum, so that we know where