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

Some more SPNEGO fixes. Getting much closer ... 

svn path=/trunk/; revision=6140
This commit is contained in:
Richard Sharpe 2002-08-30 06:11:35 +00:00
parent 4ec5a01c89
commit 765bad85dc
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packet-kerberos.c
View File

@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu
*
* $Id: packet-kerberos.c,v 1.25 2002/08/28 21:00:19 jmayer Exp $
* $Id: packet-kerberos.c,v 1.26 2002/08/30 06:11:35 sharpe Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1378,6 +1378,8 @@ proto_reg_handoff_kerberos(void)
kerberos_handle = create_dissector_handle(dissect_kerberos, proto_kerberos);
dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle);
dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle);
gssapi_init_oid("1.2.840.48018.1.2.2", proto_kerberos, ett_kerberos, "kerberos5");
}
/*

64
packet-spnego.c
View File

@ -225,7 +225,7 @@ dissect_spnego_mechToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
*/
token_tvb = tvb_new_subset(tvb, offset, nbytes, -1);
if (next_level_dissector != -1)
if (next_level_dissector != -1 && next_level_dissector)
call_dissector(next_level_dissector, token_tvb, pinfo, tree);
hnd->offset += nbytes; /* Update this ... */
@ -257,36 +257,55 @@ dissect_spnego_mechListMIC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
goto done;
}
if (!(cls == ASN1_UNI && con == ASN1_CON && tag == ASN1_SEQ)) {
proto_tree_add_text(
subtree, tvb, offset, 0,
"Unknown header (cls=%d, con=%d, tag=%d)",
cls, con, tag);
goto done;
}
offset = hnd->offset;
/* XXX: FIXME, we should dissect this as well */
if (cls == ASN1_UNI && con == ASN1_CON && tag == ASN1_SEQ) {
/*
* There seems to be two different forms this can take
* One as an Octet string, and one as a general string in a
* sequence ... We will have to dissect this later
*/
proto_tree_add_text(tree, tvb, offset + 4, len1 - 4,
"mechListMIC: %s\n",
tvb_format_text(tvb, offset + 4, len1 - 4));
/* Naughty ... but we have to adjust for what we never took */
hnd->offset += 4;
offset += len1;
}
else if (cls == ASN1_UNI && con == ASN1_PRI && tag == ASN1_OTS) {
tvbuff_t *token_tvb;
proto_tree_add_text(tree, tvb, offset, len1, "mechListMIC: %s",
tvb_format_text(tvb, offset, len1));
/*
* There seems to be two different forms this can take
* One as an Octet string, and one as a general string in a
* sequence ... We will have to dissect this later
* Now, we should be able to dispatch after creating a new TVB.
*/
proto_tree_add_text(tree, tvb, offset + 4, len1 - 4,
"mechListMIC: %s\n",
tvb_format_text(tvb, offset + 4, len1 - 4));
/* Naughty ... but we have to adjust for what we never took */
token_tvb = tvb_new_subset(tvb, offset, len1, -1);
if (next_level_dissector != -1 && next_level_dissector)
call_dissector(next_level_dissector, token_tvb, pinfo, tree);
hnd->offset += 4;
hnd->offset += len1; /* Update this ... */
offset += len1;
}
else {
proto_tree_add_text(subtree, tvb, offset, 0,
"Unknown header (cls=%d, con=%d, tag=%d)",
cls, con, tag);
goto done;
}
done:
return offset + len1 - 4;
return offset;
}
@ -559,7 +578,7 @@ dissect_spnego_responseToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
*/
token_tvb = tvb_new_subset(tvb, offset, nbytes, -1);
if (next_level_dissector != -1)
if (next_level_dissector != -1 && next_level_dissector)
call_dissector(next_level_dissector, token_tvb, pinfo, tree);
hnd->offset += nbytes; /* Update this ... */
@ -617,8 +636,6 @@ dissect_spnego_negTokenTarg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
offset = hnd->offset;
len1 -= 2; /* Account for the Header above ... */
while (len1) {
ret = asn1_header_decode(hnd, &cls, &con, &tag, &def, &len);
@ -673,6 +690,7 @@ dissect_spnego_negTokenTarg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
len1 -= (len + 2); /* FIXME: The +2 may be wrong */
printf("len1 = %d\n", len1);
}
done: