Commit Graph

37 Commits

Author SHA1 Message Date
Jaap Keuter 01e559bb2f Fix for bug 4008:
Crash on TLSv1.2 packets, caused by ssl_short_name array overrun.

svn path=/trunk/; revision=29906
2009-09-14 21:24:24 +00:00
Tomas Kukosa ebc78f0a07 Fix SSL decryption failure if client and server have the same TCP port
svn path=/trunk/; revision=29400
2009-08-13 09:07:03 +00:00
Stig Bjørlykke e3224c052e From Petr Sumbera (bug 3309):
Including openssl.h does not seem to be needed, so try removing it.

svn path=/trunk/; revision=27623
2009-03-06 19:03:42 +00:00
Tomas Kukosa 7cfcaa8a6e - detect TLS 1.2
- ciphersuite list updated
- list of alerts and extensions updated

svn path=/trunk/; revision=27421
2009-02-11 07:03:51 +00:00
Jaap Keuter 445e2212b7 Move the registration for SSL sockets to the protocol dissectors themselves.
svn path=/trunk/; revision=25721
2008-07-12 14:42:14 +00:00
Jaap Keuter b29e8aed10 From Paolo Abeni:
- the StringInfo allocator may fail when a 0 data length is requested
- many wrong values into the cipher_suites table
- duplicated code for ssl session state checking before each
  ssl_generate_keyring_material() call
- missing initialization of 'server_data_for_iv.data_len' and
  'client_data_for_iv.data_len' in ssl_session_init()

From Jaap Keuter:
- Some code rationalisation
- Gammatical/factual corrections in output and comments
- Whitespace cleanup

svn path=/trunk/; revision=25684
2008-07-09 07:24:13 +00:00
Tomas Kukosa dbd3a37c8c fix error if GNUTLS is not available
svn path=/trunk/; revision=23997
2008-01-03 09:32:12 +00:00
Tomas Kukosa b762ddcf7b From Ales Kocourek
- add ability to read server private key from encrypted PKCS#12 file
- use 0.0.0.0|any|ANY as a wildcard IP address (e.g. if one certificate is used in more servers)

svn path=/trunk/; revision=23995
2008-01-03 08:24:33 +00:00
Tomas Kukosa f9fae482f5 define ssl_debug_flush() for disabled debug
svn path=/trunk/; revision=23683
2007-11-30 12:41:23 +00:00
Tomas Kukosa aab2bf936e - fix warnings in prefs.c
- do not flush SSL debug output after each message but only once per packet

svn path=/trunk/; revision=23680
2007-11-30 11:12:55 +00:00
Sake Blok 3c9a7b9dcd Bug 1954 From Mikael Magnusson :
This patch updates the DTLS dissector to be compatible with OpenSSL 0.9.8f in
the following ways:
* Handle both SSL version number 0xfeff (RFC 4347 and OpenSSL 0.9.8f), and
0x100 (Used by OpenSSL 0.9.8e and earlier)
* Reassemble fragmented handshake messages.





svn path=/trunk/; revision=23369
2007-11-05 23:05:20 +00:00
Sake Blok 6bec9d3d9e From tmiller@hcjbtech.org : Spelling error on GDS DB protocol dissector: "Buffer lenght:"
(recursively grepped through the source and corrected all occurences, even 
the ones just in comments)



svn path=/trunk/; revision=23211
2007-10-16 23:42:33 +00:00
Gerald Combs afa9dfcddc Fix a buffer overflow found by Stefan Esser (untested).
svn path=/trunk/; revision=22883
2007-09-16 19:28:58 +00:00
Tomas Kukosa 111d18c4b3 move string tables from packet-ssl-utils.h to packet-ssl-utils.c and export them
svn path=/trunk/; revision=21445
2007-04-16 06:41:56 +00:00
Sebastien Tandel 7d89f5bf5f "false" unused variables (they are not use in wiretap repo)
svn path=/trunk/; revision=21437
2007-04-14 18:39:07 +00:00
Sebastien Tandel 68ad2f4b9b fix MacOSX gcc-3.3 warnings about unused tfs/value_string variables
most have been tagged unused (few have been deleted if dissector has not been
modified since a long time)

move packet-ssl-utils.c to DISSECTOR_SRC


svn path=/trunk/; revision=21431
2007-04-14 14:01:53 +00:00
Richard van der Hoff 5851b8aa40 remove dependency on zlib.h
svn path=/trunk/; revision=21370
2007-04-10 17:57:47 +00:00
Tomas Kukosa 9f2ccb7fc0 - SSL desegmentation support
- SSL DEFLATE compression method support (RFC3749)
- fix for Bugzilla Bug 1515: SSL bug with mutual authentication

svn path=/trunk/; revision=21368
2007-04-10 15:12:48 +00:00
Stephen Fisher dfc2b16e29 Fix mess with ssl_version_short_names[] being defined multiple places
now that it is no longer a static variable in packet-ssl-utils.h.
Leaving it as static caused a warning turned error that it was unused
in the current file (packet-ssl-utils.h).  Resolution: Move the variable
to packet-ssl.c and declare as extern in packet-dtls.c - the only other
place that needs it.


svn path=/trunk/; revision=21161
2007-03-24 01:38:58 +00:00
Stephen Fisher 1909b97d4d Remove all warnings under Unix for the gtk/ directory.
svn path=/trunk/; revision=21160
2007-03-24 00:45:11 +00:00
Tomas Kukosa 51fc862945 prepare SSL dissector for similar desegmentation as is in the TCP as current one does not work well in many cases
svn path=/trunk/; revision=20405
2007-01-12 10:25:03 +00:00
Tomas Kukosa 8e6556a3ee fix compilation without GnuTLS
svn path=/trunk/; revision=20305
2007-01-04 13:26:45 +00:00
Tomas Kukosa cf6f013568 - new ssl_set_master_secret() which can set master secret (and optionally other parameters) into SSL dissector from external source, e.g. private 'trace protocol' dissector
- call 'data' subdissector for decrypted data in real dissector is not found

svn path=/trunk/; revision=20300
2007-01-04 09:20:18 +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 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
Martin Mathieson f73d0c1f74 Try to fix build by including packet.h
svn path=/trunk/; revision=18819
2006-08-02 13:23:57 +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
Ulf Lamping f661fd9b80 #include <epan/value_string.h> must be done, even if HAVE_LIBGNUTLS isn't defined
svn path=/trunk/; revision=18584
2006-06-27 16:41:32 +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 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
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 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
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 ad3cb359b6 From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.

	Define "ssl_data_set()" regardless of whether we have GNU TLS or
	not, as it's used in either case.

	Get rid of an extra #include of epan/gnuc_format_check.h.

svn path=/trunk/; revision=17177
2006-02-06 09:09:06 +00:00
Guy Harris cc823c13aa Include <epan/gnuc_format_check.h> in packet-ssl-utils.h, not
packet-ssl-utils.c; everything else that includes it is a header file.

svn path=/trunk/; revision=17170
2006-02-06 01:14:36 +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 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