Commit graph

49 commits

Author SHA1 Message Date
Ronnie Sahlberg
10ee49cdb1 From Matthieu Patou <mat+Informatique.Samba@matws.net>
Enhancements to NETLOGON and ability to decrypt SCHANNEL



svn path=/trunk/; revision=31625
2010-01-22 22:34:24 +00:00
Bill Meier
9b568ea691 Fix gcc -Wshadow warnings
svn path=/trunk/; revision=31561
2010-01-19 00:37:39 +00:00
Stig Bjørlykke
35cdf7d240 Use proto_ntlmssp for protocol tree item.
svn path=/trunk/; revision=31424
2010-01-03 14:59:38 +00:00
Guy Harris
8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display
the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL ==
(int)BASE_NONE, so there's no source or binary compatiblity issue,
although we might want to eliminate BASE_NONE at some point and have the
BASE_ values used with integral types start at 0, so that you can't
specify BASE_NONE for an integral field.

svn path=/trunk/; revision=31319
2009-12-19 03:17:44 +00:00
Gerald Combs
f075c30958 Don't let the session blob length go stomping all over the stack with
muddy boots. Fixes bug 4239.

svn path=/trunk/; revision=30975
2009-11-16 17:08:12 +00:00
Anders Broman
88bb44a51e From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164

svn path=/trunk/; revision=30691
2009-10-25 11:43:30 +00:00
Ronnie Sahlberg
edcd3abdeb From Matthieu Patou
Update ntlmssp to automatically re-read the keytab file if it changes


svn path=/trunk/; revision=30556
2009-10-14 07:22:40 +00:00
Kovarththanan Rajaratnam
ad7042d2a4 calculate_crc32c -> crc32c_calculate for proper 'namespacing'
svn path=/trunk/; revision=30405
2009-10-08 15:10:43 +00:00
Jaap Keuter
75f1e13c12 Cleanup header fields.
svn path=/trunk/; revision=30394
2009-10-07 23:08:22 +00:00
Guy Harris
3f8748951f Fix some LLP64 issues.
svn path=/trunk/; revision=30393
2009-10-07 22:36:33 +00:00
Jeff Morriss
4c70f4fad0 Get it compiling when we don't have kerberos libraries.
svn path=/trunk/; revision=30392
2009-10-07 21:00:14 +00:00
Stig Bjørlykke
1559ec3e5f Avoid dereference of null pointer.
svn path=/trunk/; revision=30377
2009-10-06 19:21:29 +00:00
Kovarththanan Rajaratnam
cec0e21e2b Use ep_alloc()
svn path=/trunk/; revision=30367
2009-10-06 14:20:59 +00:00
Kovarththanan Rajaratnam
71f7469141 Don't include unistd.h
svn path=/trunk/; revision=30360
2009-10-06 13:21:44 +00:00
Anders Broman
809e9e9e71 Make it compile on windows.
svn path=/trunk/; revision=30357
2009-10-06 11:54:08 +00:00
Ronnie Sahlberg
161667e6bd From Matthieu Patou,
add code to decrypt ntlmv1 and v2 traffic





svn path=/trunk/; revision=30355
2009-10-06 09:13:57 +00:00
Stig Bjørlykke
4d8dd01e8e Changed flags_set_truth -> tfs_set_notset
svn path=/trunk/; revision=28989
2009-07-07 14:54:15 +00:00
Stig Bjørlykke
b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Anders Broman
c91a384702 Apply some of the patches from:
http://wiki.wireshark.org/Development/Optimization

svn path=/trunk/; revision=28356
2009-05-13 19:46:11 +00:00
Anders Broman
d36eb041ed From Jon Larimer:
NTLMSSP protocol dissector doesn't parse NTLMSSP in DCERPC packets with packet level auth
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2444

svn path=/trunk/; revision=25155
2008-04-23 20:28:30 +00:00
Stig Bjørlykke
28ae535b00 Removed even more "statement not reached" warnings.
svn path=/trunk/; revision=24286
2008-02-07 15:44:45 +00:00
Anders Broman
1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Gerald Combs
9d5858f635 Move cryptography code to epan/crypt.
svn path=/trunk/; revision=20359
2007-01-09 22:14:07 +00:00
Jaap Keuter
28560580d3 From Marc Bevandi:
Please apply this patch (made against Wireshark 0.99.4). It defines the
NTLMSSP_NEGOTIATE_ANONYMOUS flag as described in
<http://davenport.sourceforge.net/ntlm.html>.

svn path=/trunk/; revision=20022
2006-11-30 07:16:39 +00:00
Ronnie Sahlberg
05fcb684ed create subtrees also for unknown address types instead of creating the items inside the previous expansion created
svn path=/trunk/; revision=18871
2006-08-10 10:52:16 +00:00
Ronnie Sahlberg
feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Ronnie Sahlberg
6fcf2d8c66 smb2:
if the secblob starts with 'NTLMSSP'   call the ntlmssp handle directly and not the gssapi one

ntlmssp:
dont change offset when dissecting a client_time,   offset will be changed properly later outside the switch.



svn path=/trunk/; revision=17215
2006-02-08 08:48:23 +00:00
Ronnie Sahlberg
4df342823a add the CLIENT_TIME ntlmv2 addr name type
svn path=/trunk/; revision=17203
2006-02-07 12:50:58 +00:00
Ronnie Sahlberg
56b2184927 make ntlmssp tappable
svn path=/trunk/; revision=16721
2005-12-07 13:09:42 +00:00
Ronnie Sahlberg
c30eeef7d8 some more gmemchunk -> se_alloc() updates
there are only 5 gmemchunks left   but they have different litetime for their allocations   than the 100+   ones that have been removed.

The remaining 5 should be converted some other way.




svn path=/trunk/; revision=15328
2005-08-13 01:29:31 +00:00
Ronnie Sahlberg
efa1f43005 convert some tvb_fake_unicode() to tvb_get_ephemeral_faked_unicode()
svn path=/trunk/; revision=15272
2005-08-10 14:17:27 +00:00
Guy Harris
554f620001 Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043
2005-07-24 19:01:28 +00:00
Guy Harris
ef1bfb6f9b In NTLMSP_AUTH messages, include the domain name and user name in the
Info column.

svn path=/trunk/; revision=14902
2005-07-11 22:48:51 +00:00
Ronnie Sahlberg
b958accede move one function only used by SPNEGO to packet-spnego.c
remove the include of <epan/asn1.h> from kerberos, ntlmssp and gssapi since they no longer need to include that file.


svn path=/trunk/; revision=14709
2005-06-20 05:28:56 +00:00
Ronnie Sahlberg
8700645d54 add support to decrypt and dissect sign-and-sealed traffic.
(cifs: dc's talking to eachother   and when longhorn comes out: anyone wanting to talk dce to a dc!)

((this is an incredibly advanced feature well worthy of mentioning in NEWS))


svn path=/trunk/; revision=13690
2005-03-10 10:16:49 +00:00
Ronnie Sahlberg
0180d280fe change the signature for the functions to decrypt data for the
dcerpc_auth_subdissector_fns structure.

the SignAndSeal decryption (which works really well) needs this.



svn path=/trunk/; revision=13688
2005-03-10 08:50:18 +00:00
Lars Roland
ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Anders Broman
851ecd2ac4 From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the 
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass 
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image 
are present, and T.38 conversation if only m=image is present. I expect that 
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38 
packets.

svn path=/trunk/; revision=13243
2005-02-02 20:07:03 +00:00
Guy Harris
d3f5261971 Move the DES, MD4, MD5, and RC4 source files and headers into epan, and
make the source files all include the corresponding header files (so
that the declarations in the headers have to match the definitions in
the source files in order for compilation to succeed).

svn path=/trunk/; revision=12116
2004-09-27 23:29:22 +00:00
Guy Harris
bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris
09f2fe9191 Samba's smbclient doesn't put the extra stuff after the list of names in
the NTLMv2 blob, so don't bother dissecting it for now - perhaps we
should see how much of the NTLMv2 response remains, and, if there is
any, put it into the tree as extra data.

svn path=/trunk/; revision=11765
2004-08-18 06:56:36 +00:00
Guy Harris
a626d0c168 Dissect the last unknown item at the end of the NTLMv2 blob.
svn path=/trunk/; revision=11740
2004-08-15 03:24:47 +00:00
Guy Harris
50203cb822 Fix a URL.
svn path=/trunk/; revision=11600
2004-08-04 03:13:41 +00:00
Guy Harris
13bb12c4f1 Move a bunch of stuff that's more Windows-related than SMB-related to
"packet-windows-common.[ch]".

svn path=/trunk/; revision=11592
2004-08-03 02:28:49 +00:00
Guy Harris
135dd00b14 Don't drag in a huge pile of headers in "packet-smb-common.h"; rely on
the files including it to include what they need.

svn path=/trunk/; revision=11588
2004-08-02 23:40:09 +00:00
Guy Harris
1ef3caa637 Move the NTLMv2 blob stuff back into packet-ntlmssp.c - it's more
NTLMSSP-related than SMB-related, and documents about NTLMSSP talk about
it, so it's a little more convenient to keep all that stuff together -
and export it through a packet-ntlmssp.h header.

svn path=/trunk/; revision=11585
2004-08-02 23:14:32 +00:00
Guy Harris
b37500aadc Put in some comments based on information in the
http://davenport.sourceforge.net/ntlm.html document.

svn path=/trunk/; revision=11583
2004-08-02 20:26:16 +00:00
Guy Harris
5944485ccc http://davenport.sourceforge.net/ntlm.html says that the 0x80000000 is
"Negotiate 56", meaning that 56-bit encryption is supported - and that
"Negotiate 128" means that 128-bit encryption is supported, so note that
in the blurb for that flag.

It also says that the values for "Request Init Response", "Request Accept
Response", and 'Request Non-NT Session Key" are a factor of 16 away from
what our #defines say they are, and that 0x000[124]0000 are "Target Type
{Domain,Server,Share}".  Note that in a comment.

svn path=/trunk/; revision=11582
2004-08-02 19:33:49 +00:00
Gilbert Ramirez
669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00
Renamed from packet-ntlmssp.c (Browse further)