diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2002-09-04 05:46:02 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2002-09-04 05:46:02 +0000 |
| commit | 660508512602829a3ab8eb3ad7b06fced5e50360 (patch) | |
| tree | 44784019c98c14f543e28a0224fec471f487a026 | |
| parent | a842eb9d8ef21c814aa13e8aa7c90b27411562ad (diff) | |
Fix the handling of the NTLMSSP blobs in the case when the server asks
for RAW NTLMSSP, but the client actually sends SPNEGO encapsulated NTLMSSP.
svn path=/trunk/; revision=6173
| -rw-r--r-- | packet-smb.c | 18 | ||||
| -rw-r--r-- | packet-spnego.c | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/packet-smb.c b/packet-smb.c index cf85d03e6d..3319d3c67d 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.291 2002/08/31 07:26:10 sharpe Exp $ + * $Id: packet-smb.c,v 1.292 2002/09/04 05:46:01 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -5745,6 +5745,14 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree blob_item = proto_tree_add_item(tree, hf_smb_security_blob, tvb, offset, sbloblen, TRUE); + /* As an optimization, because Windows is perverse, + we check to see if NTLMSSP is the first part of the + blob, and if so, call the NTLMSSP dissector, + otherwise we call the GSS-API dissector. This is because + Windows can request RAW NTLMSSP, but will happily handle + a client that wraps NTLMSSP in SPNEGO + */ + if(sbloblen){ tvbuff_t *blob_tvb; @@ -5753,7 +5761,9 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree blob_tvb = tvb_new_subset(tvb, offset, sbloblen, sbloblen); - if (si && si->ct && si->ct->raw_ntlmssp) { + if (si && si->ct && si->ct->raw_ntlmssp && + !strncmp("NTLMSSP", + tvb_get_ptr(tvb, offset, 7), 7)) { proto_tree *ntlmssp_tree; ntlmssp_tree = proto_item_add_subtree(blob_item, @@ -5969,7 +5979,9 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre blob_tvb = tvb_new_subset(tvb, offset, sbloblen, sbloblen); - if (si && si->ct && si->ct->raw_ntlmssp) { + if (si && si->ct && si->ct->raw_ntlmssp && + !strncmp("NTLMSSP", + tvb_get_ptr(tvb, offset, 7), 7)) { proto_tree *ntlmssp_tree; ntlmssp_tree = proto_item_add_subtree(blob_item, diff --git a/packet-spnego.c b/packet-spnego.c index 3042cc1082..07aba0de4d 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.23 2002/09/03 16:45:31 sharpe Exp $ + * $Id: packet-spnego.c,v 1.24 2002/09/04 05:46:02 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -276,7 +276,7 @@ dissect_spnego_mechListMIC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset + 4, len1 - 4, "mechListMIC: %s", - tvb_format_text(tvb, offset + 4, len1 - 4), len1); + tvb_format_text(tvb, offset + 4, len1 - 4)); /* Naughty ... but we have to adjust for what we never took */ |