diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2003-05-23 17:46:06 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2003-05-23 17:46:06 +0000 |
| commit | 8df9b98bfc10b9a826ee36556f95c6bb3610f20e (patch) | |
| tree | bf8a641d542fb3abd59aa30c37d50594820473e2 /packet-spnego.c | |
| parent | d3913cfdb13d3489f1e212b22a6e44cd9c24fd25 (diff) | |
First changes to properly support RFC1964 so that GSSAPI GetMIC and other
tokens can be handled.
Really, dissect-spnego-krb5 or whatever, should be renamed to something like
dissect-gssapi-tokens or dissect-gssapi-rfc1964 ...
svn path=/trunk/; revision=7724
Diffstat (limited to 'packet-spnego.c')
| -rw-r--r-- | packet-spnego.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/packet-spnego.c b/packet-spnego.c index aab1093e2d..bf2557192c 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -4,7 +4,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-spnego.c,v 1.42 2003/02/17 17:32:59 sharpe Exp $ + * $Id: packet-spnego.c,v 1.43 2003/05/23 17:46:06 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -176,6 +176,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ASN1_SCK hnd; gboolean def; guint len1, cls, con, tag, oid_len, nbytes; + guint16 token_id = 0; subid_t *oid; gchar *oid_string; gssapi_oid_value *value; @@ -269,6 +270,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Next, the token ID ... */ + token_id = tvb_get_letohs(tvb, offset); proto_tree_add_item(subtree, hf_spnego_krb5_tok_id, tvb, offset, 2, TRUE); @@ -291,6 +293,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* Next, the token ID ... */ + token_id = tvb_get_letohs(tvb, offset); proto_tree_add_item(subtree, hf_spnego_krb5_tok_id, tvb, offset, 2, TRUE); @@ -299,9 +302,31 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; } - krb5_tvb = tvb_new_subset(tvb, offset, -1, -1); + switch (token_id) { - offset = dissect_kerberos_main(krb5_tvb, pinfo, subtree, FALSE); + case KRB_TOKEN_AP_REQ: + case KRB_TOKEN_AP_REP: + case KRB_TOKEN_AP_ERR: + krb5_tvb = tvb_new_subset(tvb, offset, -1, -1); + offset = dissect_kerberos_main(krb5_tvb, pinfo, subtree, FALSE); + break; + + case KRB_TOKEN_GETMIC: + + break; + + case KRB_TOKEN_WRAP: + + break; + + case KRB_TOKEN_DELETE_SEC_CONTEXT: + + break; + + default: + + break; + } done: return; |