Commit Graph

47 Commits

Author SHA1 Message Date
Ronnie Sahlberg 350cd176c2 From SF
Attached is a fix for bug #1156: "If a dissector depends on a new
datasource created by a new tvb, that dissector's protocol can't be
filtered on."


Thanks,
  Steve



I change the code slightly to avoid dereferenceing a NULL pointer.
While the original code was fine and safe on unix   dereferencing a null pointer in this way would be unsafe and cause a segmentation violation on windows   if tree is NULL.



svn path=/trunk/; revision=19791
2006-11-04 08:54:45 +00:00
Tomas Kukosa cd92272ac9 debug trace at beginning of each packet
do not call subdissector for empty application data

svn path=/trunk/; revision=19574
2006-10-17 13:29:44 +00:00
Jaap Keuter f9e196db54 Fix for bug 1153, typos in debug output
svn path=/trunk/; revision=19451
2006-10-08 07:54:06 +00:00
Guy Harris 240f452c38 Squelch a compiler warning.
Clean up indentation.

svn path=/trunk/; revision=19315
2006-09-24 20:29:47 +00:00
Tomas Kukosa eb86b80cf4 display Random as a single item with two subitems
svn path=/trunk/; revision=19084
2006-08-30 07:31:36 +00:00
Tomas Kukosa 10db04c78b get rid of few warnings
svn path=/trunk/; revision=19072
2006-08-29 08:33:52 +00:00
Tomas Kukosa 539102ca60 - new function ssl_dissector_delete()
- register H.225.0 over TLS (configurable port 1300)
- register SIP over TLS (fixed port 5061)
- new function proto_tree_get_root()

svn path=/trunk/; revision=19059
2006-08-28 07:05:02 +00:00
Tomas Kukosa ce4e15b76d new ssl_dissector_add() function which can be called from another dissectors (similar to dissector_add())
svn path=/trunk/; revision=19026
2006-08-25 08:07:26 +00:00
Gerald Combs 0213f60e4b Add GNUTLS to the Windows build.
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg 7b3b26fd39 from a. samuel
ssl and dtls updates


svn path=/trunk/; revision=18816
2006-08-02 08:15:51 +00:00
Ronnie Sahlberg ca3288b0f7 minor indentation changes
put an entry in the tree for the encrypted payload



svn path=/trunk/; revision=18629
2006-07-01 05:41:30 +00:00
Ronnie Sahlberg 9957aa8e0d ssl update register protocols with a decryption key with the protocol name instead of a "tunneled protocol" fake port thing.
this break old preference settings   but as we havent shipped any win32 version with this feature yet    it shouldnt be any drama



see wiki for updates on the new format


(we still need many many updates and cleanups to the code   but the non-backward compatible preference change must go in asap)



svn path=/trunk/; revision=18609
2006-06-29 09:06:41 +00:00
Ronnie Sahlberg a134276421 make the three decryption preferences only be visible IF wireshark is compiled for ssl decryption (==with libgcrypt and gnutls)
this makes it easier for users to determine whether their versaion of wireshark can or can not decrypt ssl traffic



svn path=/trunk/; revision=18604
2006-06-29 07:31:52 +00:00
Ronnie Sahlberg 45aac4eb43 coverity 200 remove redundant null tests for pinfo->fd
svn path=/trunk/; revision=18594
2006-06-28 07:51:31 +00:00
Ronnie Sahlberg 1bcccd9863 coverity 199 remove a pointless test for NULL for something that can never be null.
svn path=/trunk/; revision=18593
2006-06-28 07:44:47 +00:00
Ronnie Sahlberg a2e5a1c806 coverity 198
svn path=/trunk/; revision=18592
2006-06-28 07:37:54 +00:00
Ronnie Sahlberg ad274d0542 make the called subdissectors create their protocol expansion at the first level of the tree and not deep inside the SSL layer
makes the traces much more readable


svn path=/trunk/; revision=18583
2006-06-27 13:51:13 +00:00
Ronnie Sahlberg 16d463dac6 from Authesserre Samuel
SSL updates and DTLS support


svn path=/trunk/; revision=18582
2006-06-27 13:36:10 +00:00
Anders Broman 0e1b053f82 From Albert Chin:
This fixes a redefine of AF_INET6 on AIX 4.3.3. We pull in <sys/socket.h> so the OS can define it first, nullifying the #define in epan/inet_v6defs.h.

svn path=/trunk/; revision=18522
2006-06-20 05:59:55 +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
Anders Broman dbdb3729de From Paolo Abeni:
authesserre samuel <sauthess@gmail.com> kindly pointed out an issue with session renegotiation in the current ssl decryption code. 

Encrypted handshake message are decrypted, but the dissector try to interpret the encrypted code. Renegotiation messages are therefore ignored. The attached pcap trace and key can be used to trigger the issue.

The attached patch fix the problem storing the decrypted version of encrypted handshake message and dissecting it when available. The patch also fix bad issue with des cipher (alike the issue fixed in my previous post)

svn path=/trunk/; revision=18081
2006-05-03 05:29:04 +00:00
Jörg Mayer dbbd8cd9a1 authesserre samuel <sauthess@gmail.com>:
The current ssl decryption code does not work for 3des session.
The attached patch fixes the problem.


svn path=/trunk/; revision=18004
2006-04-26 15:10:23 +00:00
Jörg Mayer 377e6e2e27 Paolo Abeni:
pinfo->net_src and pinfo->net_dst where used to set up conversation, but
this fields are null on eap stream. use pinfo->src and pinfo->dst
instead.
The patch also enable strict checking in the 'follow ssl stream' dialog.


svn path=/trunk/; revision=17333
2006-02-17 11:56:52 +00:00
Gerald Combs 7353fadc50 Make sure SSL_DEBUG_USE_STDERR is always defined.
svn path=/trunk/; revision=17303
2006-02-14 18:52:26 +00:00
Jörg Mayer 461b6d35ee Paolo Abeni:
- enable the 'follow SSL stream' menu item only when a ssl packet is selected.
- when 'following' an ssl stream, show ssl decrypted data only for current conversation.
- fix a typo in ssl preference description.


svn path=/trunk/; revision=17301
2006-02-14 14:53:03 +00:00
Jörg Mayer 36bad901af Paolo Abeni
the attached patch fix a couple of possible memory leak in the ssl
decryption code, add some indentation fix, more comments and add the
preference to select the debug output (missing in previous patch)



svn path=/trunk/; revision=17281
2006-02-13 17:06:41 +00:00
Jörg Mayer b55002ab8d Paolo Abeni:
The attached patch cleanup the debug infrastructure for ssl dissector.
Debug messages are by default off and can be enabled via the ssl
dissector preference. Debug output can be directed to stderr or file.


svn path=/trunk/; revision=17253
2006-02-11 13:41:17 +00:00
Anders Broman e8978fda03 From Paolo Abeni:
The attached patch fix bug 732.
 The problem was in the client key dissection. On ssl v3 the encrypted
 data is the whole record data, on tls v1 the encrypted data is preceded
 by the 2 bytes length of the encrypted data itself.

svn path=/trunk/; revision=17244
2006-02-10 13:20:11 +00:00
Jörg Mayer 1174fe71e7 Paolo Abeni:
the attached patch clean a bit the ssl decryption related code, removing
a macro I used when the code was still for an external plugin.


svn path=/trunk/; revision=17217
2006-02-08 12:45:14 +00:00
Anders Broman 250a701144 Newlines in preference comments causes problems in reading the prefeerence file.
svn path=/trunk/; revision=17205
2006-02-07 19:31:54 +00:00
Jörg Mayer 83068a9b9d Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.


The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.


svn path=/trunk/; revision=17200
2006-02-07 10:26:20 +00:00
Guy Harris 60419eab20 From Paolo Abeni: fix some warnings, etc..
svn path=/trunk/; revision=17169
2006-02-06 01:01:09 +00:00
Jörg Mayer 59c6c554ea Buildbot found:
- p_rem_proto_data has been renamed to p_remove_proto_data
- I forgot to commit the changes to Makefile.common

svn path=/trunk/; revision=17157
2006-02-05 02:33:06 +00:00
Jörg Mayer 9ba6da080a Paolo Abeni
I have developed an external plugin to enable ssl decryption in
ethereal.

Me

- Remove unnecessary $Id$ from acinclude.m4
- Added packet-ssl-utils.h to Makefile.common
- Fixed a few warnings

TODO

- Lots of warning fixes (see separate mail)
- Reformat function headers to read like the others do
  (return value<newline>function-name...)
- Test on Windows platform
- Review the patch to packet-ssl.c and new files packet-ssl-utils.[hc]


svn path=/trunk/; revision=17156
2006-02-04 23:44:05 +00:00
Jörg Mayer 69dcb66cd9 More char -> const char warning fixes
svn path=/trunk/; revision=15218
2005-08-05 00:23:22 +00:00
Guy Harris ab797734dd Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.

svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
Anders Broman 52e6e313ed From Mike Duigou:
A few doxygen updates and an improved section on 
writing dissectors that don't use tcp_dissect_pdus().

svn path=/trunk/; revision=14536
2005-06-03 06:34:35 +00:00
Gerald Combs 76f7e225ae More gratuitous tvb_ensure_bytes_exist()ing. One of them fixes bug 67.
svn path=/trunk/; revision=14120
2005-04-18 02:33:11 +00:00
Guy Harris 177e6f1bc2 From Yaniv Kaul: show the protocol name in every record.
svn path=/trunk/; revision=13623
2005-03-06 04:42:51 +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 c6bdaa41c6 From Jouni Malinen: use a length field from the packet to determine how
much data is available, rather than using "tvb_length_remaining()".

svn path=/trunk/; revision=12840
2004-12-26 22:52:16 +00:00
Guy Harris 355c52a0b3 From Jouni Malinen: dissect TLS extensions (RFC 3546) for ClientHello
and ServerHello.

svn path=/trunk/; revision=12836
2004-12-26 00:28:47 +00:00
Guy Harris 766fcf0ba9 From Yaniv Kaul: adds LZS as a compression method, per 'Transport Layer
Security (TLS) Protocol Compression UsingLempel-Ziv-Stac (LZS)' RFC (RFC
3943).

svn path=/trunk/; revision=12633
2004-12-01 11:19:04 +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
Ulf Lamping d530bd4e14 Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...

svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
Ronnie Sahlberg 41c1f32cb4 From Yaniv Kaul:
Call the x509 certificate dissector from SSL so that x509 certificates
in SSL are dissected


svn path=/trunk/; revision=11578
2004-08-02 08:57:40 +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