Commit graph

107 commits

Author SHA1 Message Date
Bill Meier
4c46725c2c Fix vi "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39074
2011-09-21 16:28:53 +00:00
Stig Bjørlykke
0554530407 From Dirk via bug 6361:
Use File/Directory Dialog as a field type for UAT preferences.

svn path=/trunk/; revision=39059
2011-09-20 10:15:09 +00:00
Chris Maynard
f47ccd73c1 Close fp before checking if private_key is NULL to avoid memory leak. Fixes Coverity 597.
svn path=/trunk/; revision=39049
2011-09-19 19:32:46 +00:00
Jaap Keuter
9832ff5657 From Andrey Kulikov:
Patch to show GOST certificate types in CertificateRequest message.

svn path=/trunk/; revision=37776
2011-06-23 21:33:29 +00:00
Jaap Keuter
525b5fb796 From Andrey Kulikov:
Patch to TLS dissector to show GOST ciphesuites names. 

svn path=/trunk/; revision=37775
2011-06-23 21:17:42 +00:00
Bill Meier
91191c6c00 Fix some gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
(Code commented out since it may be required in the future (at least in some cases).

svn path=/trunk/; revision=37723
2011-06-20 01:13:21 +00:00
Anders Broman
1a768b36b4 - Added new SignatureIdentity values.
From Marc Petit-Huguenin:
- Removed directResponseForwarding.
- The certificate_type enum is now defined as RFC 6091's CertificateType
  so moved the definition to packet-ssl-utils.[ch].
- Fixed invalid values for CERTIFICATE_BY_NODE and CERTIFICATE_BY_USER
  Kinds.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5967

svn path=/trunk/; revision=37452
2011-05-29 06:16:19 +00:00
Sake Blok
ba086053c7 Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)


svn path=/trunk/; revision=37446
2011-05-28 18:17:50 +00:00
Sake Blok
8f5742c5ad Extended the SSL key log import routine to be able to read the following format:
RSA Session-ID:xxxx Master-Key:xxxx

This makes it easy to use the "openssl s_client" output for decryption
(see: http://ask.wireshark.org/questions/4229/follow-ssl-stream-using-master-key-and-session-id)

It also paves the way for exporting SSL keyring material. See also the enhancement request in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444


svn path=/trunk/; revision=37401
2011-05-25 21:49:29 +00:00
Jeff Morriss
4a90e977e0 From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT.  (The
former can be built using libnettle instead of the latter.)

svn path=/trunk/; revision=37102
2011-05-12 20:51:53 +00:00
Jeff Morriss
02835bc4c5 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
5. A guaranteed null pointer access violation is fixed in packet-ssl-utils.c
when DTLS succeeded in dissecting its payload.

svn path=/trunk/; revision=37058
2011-05-11 02:06:22 +00:00
Jakub Zawadzki
d621e6acbe Cleanup: g_malloc can't return NULL, remove checks for them.
XXX, should this code use g_try_malloc instead?

svn path=/trunk/; revision=36988
2011-05-04 21:19:04 +00:00
Gerald Combs
767e73c3d5 From Adam Langley via bug 4349:
This patch adds support for getting the pre-master secret of a TLS
connection from a log file. Currently Wireshark can decrypt and TLS
connection only if it has the server's private key.

I commonly have a use case where I control the TLS client, but not the
server.  In order to decrypt in this case, I've added support to NSS
(used by Chrome and Firefox) to log the keys to a file on disk:

https://bugzilla.mozilla.org/show_bug.cgi?id=536474

Given this file, Wireshark can then decrypt the resulting TLS connections.

The format is such that Wireshark opens and linearly scans the file each
time it sees a ClientKeyExchange. If the key log grows too large, this
is pretty inefficient. However, it's simple and the number of
interesting TLS connections when debugging is usually very small.

svn path=/trunk/; revision=36876
2011-04-26 22:51:35 +00:00
Gerald Combs
c6fecb57b0 From Ivan Sy via bug 3343:
- Support for DTLS and SSL RSA keys list using User Accessible Table
- Support for IPv6 SSL as posted by bug#3343 comment#1
- 'any' and 'anyipv4' for IPv4 wildcard
- 'anyipv6' for IPv6 wildcard
- UAT fields validation.


From me:

- Update paramaters to match UAT API changes.
- Change the UAT filename.
- Fix buffer overflow for IPv6 addresses.
- Allow the use of hostnames along with numeric addresses.
- Don't convert strings to addresses twice.
- Don't use the same variable name for different data types.
- Make "any" mean "any IPv4 or any IPv6".
- Bend the concept of obsolete preferences slightly so that we can convert
  and old-style key list to a UAT.
- Clean up whitespace.
- Don't point to a User's Guide section for now; it may make more sense to
  keep using the wiki page.
  
SSL dissector changes have been tested. DTLS dissector changes have not.

svn path=/trunk/; revision=36875
2011-04-26 21:59:11 +00:00
Stig Bjørlykke
bdf603c403 Close fp in error case in ssl_parse_key_list to avoid leakage.
Coverity 597.

svn path=/trunk/; revision=36246
2011-03-22 11:40:15 +00:00
Bill Meier
ff6cd61a00 Check that imported private key is RSA; Prevents a crash.
Fixes Bug #5662

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662

svn path=/trunk/; revision=36174
2011-03-09 00:43:49 +00:00
Anders Broman
c4fe9a28ca From Kaspar Brand:
SSL/TLS dissector: add support for "Certificate Status" messages (aka OCSP stapling)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5503

svn path=/trunk/; revision=35655
2011-01-26 08:49:06 +00:00
Guy Harris
a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Sake Blok
c16ac675d9 Add support for the TLSv1.2 format of the CertificateRequest handshake message.
(see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5485 )


svn path=/trunk/; revision=35216
2010-12-18 01:16:11 +00:00
Bill Meier
28402479cc Use value_string_ext fcns to access two value-string arrays;
Reorder value-string arrays slightly so they are in ascending order.

svn path=/trunk/; revision=34699
2010-10-29 22:18:44 +00:00
Bill Meier
209109c2fd Define some fcns & vars as static ...
svn path=/trunk/; revision=34458
2010-10-10 20:07:06 +00:00
Jeff Morriss
1a322b6955 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5277 :
Don't pass a NULL pointer to a string to ssl_debug_printf() (which eventually
calls vfprintf()): Solaris doesn't like it when you do that.

svn path=/trunk/; revision=34386
2010-10-05 19:53:37 +00:00
Jeff Morriss
2b52159449 Follow up to bug 5209 and rev 34115:
%hh is C99 so remove it from packet-ssl-utils and add it to the banned list
(similar to %ll) in checkAPIs.pl .


svn path=/trunk/; revision=34120
2010-09-15 14:10:25 +00:00
Anders Broman
5a28b5317e From Yaniv Kaul:
[PATCH] Add SSL cipher 'Transport Layer Security (TLS) Renegotiation Indication Extension' (RFC 5746)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5207

svn path=/trunk/; revision=34110
2010-09-13 16:51:10 +00:00
Jaap Keuter
ccc74ae967 Take in updates from the TLS registery.
svn path=/trunk/; revision=33948
2010-08-27 06:28:17 +00:00
Anders Broman
8396802773 From "wiresharkbugzilla@jdkbx.cjb.net":
Support for RFC4279 Pre-Shared Key Ciphersuites for Transport Layer Security (TLS)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4853

svn path=/trunk/; revision=33309
2010-06-24 06:01:11 +00:00
Jaap Keuter
4ab14bc71e Ditch the last direct indexed character array.
And some minor formatting updates.

svn path=/trunk/; revision=31921
2010-02-19 07:43:26 +00:00
Jaap Keuter
ef44e06208 From Jens Weibler:
Just a small patch to add information about elliptic curves for SSL-connections.

svn path=/trunk/; revision=31744
2010-01-31 19:57:01 +00:00
Jaap Keuter
864c4d5521 From Laurent Boulard:
Follow SSL Stream for TLS_RSA_WITH_NULL_SHA and TLS_RSA_WITH_NULL_MD5.

svn path=/trunk/; revision=31733
2010-01-29 21:14:23 +00:00
Sake Blok
6a87ff2569 Fix a spelling error : entrypted -> encrypted
(found by Adam Langley in bug 4349)



svn path=/trunk/; revision=31628
2010-01-22 23:09:19 +00:00
Bill Meier
73eb16d678 Fix some gcc -Wshadow warnings
svn path=/trunk/; revision=31623
2010-01-22 17:41:47 +00:00
Guy Harris
268345f515 Use G_GSIZE_MODIFIER rather than casting to "gulong" and printing with
"%lu".

svn path=/trunk/; revision=31541
2010-01-16 02:57:42 +00:00
Gerald Combs
4381c54f07 Can someone explain why it's a good idea that functions like strlen
return a size_t and then not define a size_t format specifier for sprintf?

svn path=/trunk/; revision=31342
2009-12-21 21:34:18 +00:00
Gerald Combs
8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +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
Jeff Morriss
44ea4b1494 ssl_association_remove(): free assoc->info too
svn path=/trunk/; revision=29914
2009-09-15 01:08:58 +00:00
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
Jaap Keuter
564eff837f From Ivan Sy:
Add a more descriptive log message on DH key exchange.

svn path=/trunk/; revision=29825
2009-09-09 19:09:57 +00:00
Kovarththanan Rajaratnam
8c48c6835f Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
Bill Meier
8e1021f0c2 Rework code slightly to prevent several GCC "breaking strict-aliasing rules" warnings
svn path=/trunk/; revision=29554
2009-08-25 23:03:10 +00:00
Tomas Kukosa
e7ed279da9 fix build failure without GnuTLS
svn path=/trunk/; revision=29402
2009-08-13 11:12:35 +00:00
Tomas Kukosa
ae5e82dc11 use G_GSIZE_MODIFIER instead of %zd which is not supported by MSVC
svn path=/trunk/; revision=29401
2009-08-13 10:36:53 +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
Tomas Kukosa
cb5415d399 fix memoryleak causing crash with long SSL traces
svn path=/trunk/; revision=29392
2009-08-12 06:10:08 +00:00
Michael Tüxen
246d8f9c6c Bring cipher suites in sync.
svn path=/trunk/; revision=28542
2009-05-31 15:25:38 +00:00
Michael Tüxen
c69b435205 Add cipher suites defined in RFC 4279.
svn path=/trunk/; revision=28535
2009-05-30 19:52:41 +00:00
Stig Bjørlykke
62f60df6b4 From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.

svn path=/trunk/; revision=27718
2009-03-13 22:06:48 +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
Bill Meier
c0e92cbc04 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27065
2008-12-20 00:09:02 +00:00
Tomas Kukosa
cb63b11f97 fix warning
svn path=/trunk/; revision=27031
2008-12-17 07:22:19 +00:00