Commit Graph

66364 Commits

Author SHA1 Message Date
Peter Wu 23d3a30216 ssl-utils: refactor DigitallySigned
Refactor DigitallySigned dissection to return the length and make it
accept a version integer instead of Session pointer. Hopefully this
makes it easier to use the routine for SCT dissection in X.509 certs.

While at it, convert it to use ssl_add_vector.

Change-Id: I64afecc65ff597fda50d208d8f96ca0b97bfcbde
Reviewed-on: https://code.wireshark.org/review/20111
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:04:38 +00:00
Diederik de Groot 9a22102d35 [skinny]: Added conversation and request_response handling
Improvements:
 - added conversation
 - added request/response handling

Change-Id: Ia670eb23c0671b195108876a30ff3ff5eb4a152c
Reviewed-on: https://code.wireshark.org/review/20094
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:01:54 +00:00
Oliver Downard e6c51e7bad Couchbase: Add support for XATTRs
Please see https://issues.couchbase.com/browse/MB-22004

Alters subdoc dissecting to support XATTRs
Accomodates for the addition of the XATTR HELLO flag
Changes SET_WITH_META to support XATTRs
Changes DCP mutation/deletion to support XATTRs

Change-Id: I4ff6e498b96c329d51167daf58a6d85c1f0c77c4
Reviewed-on: https://code.wireshark.org/review/20062
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:00:44 +00:00
John Viklund cd1d90e994 ROHC: Basic support for RTP extension 3
Change-Id: Ifcc9d3791c54c484a2ec6f6e566a07e7dfc9fe7e
Reviewed-on: https://code.wireshark.org/review/20088
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 04:57:39 +00:00
Guy Harris 724dc1cf5c "NULL" is not what you use for a null pointer.
It's a non-null pointer to a character string with the value "NULL".
You want just NULL, with no quotes.

Change-Id: I51bfb73a3002f46f13a8f513d07b1ddc009a14cb
Reviewed-on: https://code.wireshark.org/review/20123
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-16 00:47:05 +00:00
Mark Phillips 64f83641ad Cleanup runlex.sh to use builtin POSIX functions instead of sed
Bug: 13412

Change-Id: If43b30a33dcc4f23ba2bcb3cce3d0feea0d9fe40
Reviewed-on: https://code.wireshark.org/review/20120
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-15 20:58:43 +00:00
AndersBroman 0f5948015d ifdef g_list_free_full it requires glib 2.28
Change-Id: I390d602c6caaa5daa2928dcd37f5f476195a685f
Reviewed-on: https://code.wireshark.org/review/20118
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-15 20:37:38 +00:00
Pascal Quantin 0b8a12fd51 Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6
Also switch some third party libraries to stripped version to reduce size

Change-Id: If0fd06a85fb17fb3e35543bcc714c8a8a1ce20c6
Reviewed-on: https://code.wireshark.org/review/20117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-15 17:32:36 +00:00
Peter Wu a691315652 TLS13: handle message-specific TLS extensions
Some extensions from the client are processed differently than those
sent by the server. In TLS 1.3 the Encrypted Extensions section took
over most of the Server Hello extensions and some appear in Certificate.

Based on https://tlswg.github.io/tls13-spec/#rfc.section.4.2

Change-Id: I40d98bae21fe7933563df4a79b0cec4bf02a76f8
Reviewed-on: https://code.wireshark.org/review/20109
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-15 12:25:26 +00:00
Peter Wu 3e7f32e328 ssl-utils: sort extensions cases
Sort cases to match the extension numbers. No functional change.

Change-Id: I648ecce9037511cc19721e81b434645d61560dd2
Reviewed-on: https://code.wireshark.org/review/20108
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-15 12:24:49 +00:00
Peter Wu e207506cab TLS13: dissect NewSessionTicket and CertificateRequest extensions
Process NewSessionTicket and CertificateRequest extensions for TLS 1.3.
CertificateExtension in draft -18 is replaced by Extension in the next
draft, so anticipate for that and start decoding this extensions vector.
Rename ssl_dissect_hnd_hello_ext to reflect extended functionality.

(Certificate Extensions SCT is still not dissected though, but at least
OCSP (status_request(_v2)) is supported now.)

Change-Id: I3cae58dbde600e82598b3c2f8e29e92e38cd1db1
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/20104
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-15 12:24:36 +00:00
Peter Wu bb1450b017 ssl,dtls: fix wrong expert info for overly large records
The plaintext length is limited to 2^14, but the actual record length
(TLSCiphertext) may be larger due to expansion from compression and the
cipher (like AEAD auth tags). The wrong check led to false expert infos.

Change-Id: I3a56f1b0af05ecc1d97c4f1f0bcf35ff4d0fad42
Fixes: v2.3.0rc0-1584-gff0371e898 ("ssl,dtls: add expert info for overly large record lengths")
Reviewed-on: https://code.wireshark.org/review/20099
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-15 12:19:40 +00:00
John Viklund efcb5c07f0 Display 4 octets SDVL with 3 bits in ROHC
Four octets self-describing variable-length in ROHC has three bits
discriminator, not four as previously displayed.

Change-Id: Ibe366aed3ac822abd0046efe71e9b4e4c633524f
Reviewed-on: https://code.wireshark.org/review/20112
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-15 10:06:10 +00:00
Stig Bjørlykke 78ce70e908 Qt: Indicate profile created from system provided
Indicate when a profile is created from a system provided profile.

Change-Id: Iaabe5a2dbf17c7baa14e888dfab5f2aeadaedb67
Reviewed-on: https://code.wireshark.org/review/20107
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-15 07:05:41 +00:00
Pascal Quantin 6f18fed9ab wiretap: fix wtap_opttypes_cleanup() function
Change-Id: I475e2bc54af470e380e23e5dd98198885e189d6f
Reviewed-on: https://code.wireshark.org/review/20106
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 20:01:20 +00:00
Stig Bjørlykke c01cdd4e47 Qt: Reset Default profile support
Add support for resetting the Default profile by deleting it in
the Profile Dialog.  All profile files will be deleted and all
other files will be kept.

Change-Id: I795a6db3ee7b2c29e7aba461183e6cc411798b75
Reviewed-on: https://code.wireshark.org/review/20097
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-14 18:15:12 +00:00
Pascal Quantin fe78e1302f BT LE LL: fix invalid memory access reported by valgrind
- broadcast_addr shoudl be static and not on call stack
- set the AT_STRINGZ address length with the string length and not the buffer length

Bug: 13381
Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c
Reviewed-on: https://code.wireshark.org/review/20103
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 18:02:50 +00:00
Pascal Quantin bc29b8c9b6 androiddump: fix compilation with ANDROIDDUMP_USE_LIBPCAP define
Change-Id: I6edc4ff9f4db5fab9b80cb0be56639443ab22518
Reviewed-on: https://code.wireshark.org/review/20105
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 17:23:58 +00:00
Dario Lombardo 0ed10658cf rawshark: add initializer.
Change-Id: I696b1cfd7cf226d07918cca708a3463db3114333
Reviewed-on: https://code.wireshark.org/review/20100
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-14 14:31:16 +00:00
S. Shapira 319de13b89 Handle NSAP IPv4 addresses in NBAP's TransportLayerAddress field which aren't padded to 20 bytes (= max NSAP address length, expected by NSAP dissector).
Bug: 13399
Change-Id: Ife0b3bbaf851e821dbfde15610eee69e9e7a6e62
Reviewed-on: https://code.wireshark.org/review/20069
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 13:39:22 +00:00
Dario Lombardo 415580b060 tshark: free capture file filename on exit.
Change-Id: I561bc7b46ad8582013d3897ae19801d2fc5a7f49
Reviewed-on: https://code.wireshark.org/review/19950
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-14 13:25:39 +00:00
Jan Spevak 4b423c5fb1 gtp: changed display format of a FQDN from BYTES to STRING
as suggested on https://code.wireshark.org/review/#/c/19930/

Change-Id: Ia340b733fb87b3e139b165ff701ff0ba25c1cf44
Reviewed-on: https://code.wireshark.org/review/19931
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 10:45:13 +00:00
Dario Lombardo 7c0c580c4b wiretap: add cleanup routine.
The cleanup routine has been added to exit section of the applications.
Those which required a exit restyle have been patched as well.

Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1
Reviewed-on: https://code.wireshark.org/review/19949
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-14 10:22:20 +00:00
AndersBroman ae0bdcc78c [Diameter AVPs] Add 3GPP AVP 1664 to 1680 from TS 29.272
Change-Id: Iccc98e4bb6f7923c9ed0720d6fc469f5c3f74d39
Reviewed-on: https://code.wireshark.org/review/20096
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-14 04:55:05 +00:00
Joerg Mayer 993e0989f9 Change Qt setup from 5.5.0 to 5.8.0
Change-Id: Ic98922a9e3bf784487512c28921eb5c7d9914e53
Reviewed-on: https://code.wireshark.org/review/19962
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-13 22:02:31 +00:00
Peter Wu 6b84ddee83 Make Libgcrypt a mandatory dependency
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to
error out if it is not available. Update release notes, developer
documentation and README with the new status. Clarify relation with
GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script.

Motivation for this change is that many dissectors depend on Libgcrypt
and having it optional increases the maintenance burden (there have been
several compile issues in the past due to the optional status).
Furthermore, wsutil has crypto code that can be replaced by Libgcrypt.

Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f
Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
Reviewed-on: https://code.wireshark.org/review/20030
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-13 18:35:47 +00:00
AndersBroman b5610a0436 [ISAKMP] Dissect 3GPP private error and status messages in NOTIFY.
Change-Id: Iaa65c1cf9f358e36e77b4a5cad2543dcbb98072e
Reviewed-on: https://code.wireshark.org/review/20090
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-13 17:36:52 +00:00
Dario Lombardo 119bf86366 tools: add suppressions to valgrind.
Remove leaks from libgcrypt.

Change-Id: I920e504cfcb45c41510f3edc65d2dbeefda5c5a1
Reviewed-on: https://code.wireshark.org/review/20093
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-13 16:43:44 +00:00
Guy Harris 940c758ef6 Further explanation in comments.
Change-Id: If88220dc39b2a6baeeefc244639992271b7f0464
Reviewed-on: https://code.wireshark.org/review/20086
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-13 03:33:54 +00:00
Guy Harris b0090953ca Fix a comment to reflect (and better explain) reality.
Change-Id: I4d87438046c18419cea775c547c49cd3abb2089e
Reviewed-on: https://code.wireshark.org/review/20085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-13 03:30:46 +00:00
Jakub Zawadzki ece6e7c1a4 Fix compilation without plugins.
proto.c:667:6: error: ‘dissector_plugins’ undeclared (first use in this function)
tap.c:773:20: error: ‘tap_plugins’ undeclared (first use in this function)

Change-Id: I8feaec4219dc97202bdb79d72399c5fd1d383e27
Reviewed-on: https://code.wireshark.org/review/20081
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-12 23:17:42 +00:00
Guy Harris ad2eb833c8 Set the partial AID in the radio metadata structure.
Change-Id: I2d5a1cd7d264e8df7f4520272d6310e49cf8126d
Reviewed-on: https://code.wireshark.org/review/20080
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 18:59:17 +00:00
Pascal Quantin 8bc29d187d sharkd: fix a memory leak on Windows introduced in gfe06aad
Change-Id: I907dbc924574b02d2f1b8d7668158b5b6d2c87cf
Reviewed-on: https://code.wireshark.org/review/20073
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-12 17:50:45 +00:00
Martin Kacer dc3b7722cd tshark removed empty line in -T ek output
Change-Id: Id4c1ab258308ecc8421a5c82b6e937a9d35bf58e
Reviewed-on: https://code.wireshark.org/review/20061
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-12 17:03:15 +00:00
Dario Lombardo 6322f9ce61 uat: add missing parameter to documentation.
Change-Id: Ic39b00e0800c123083a6583d78eb96154b93e49f
Reviewed-on: https://code.wireshark.org/review/20075
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-12 17:00:51 +00:00
Diederik de Groot ea0a7f211c [skinny]: Add struct/union guards to multi-part message handlers
Improve multi-part message handling
- Calculate (sub) structure/union length
- Add a guard when iterating over multi-part message
- For fixed length messages, advance the cursor when iteration falls short of max length

Change-Id: Id2af3aa1a878328f105e173cabe2b68dd0343507
Reviewed-on: https://code.wireshark.org/review/20057
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12 16:21:02 +00:00
Diederik de Groot fb3a7caa17 [skinny] Fix ConnectionStatRes and DialedNumber Messages protocol version >20
- ConnectionStatisticsResponse Comes in three different forms
- DialedNumber Message has variable length

Minor:
- Pass ipv4or6 connection address back to calling function (using this later on in seperate commit)
- Correct spelling mistakes
- Remove duplicates from DeviceType[]

Change-Id: Ib1619b163c12b6a4c6c86972186d828be3fd94e2
Reviewed-on: https://code.wireshark.org/review/20056
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12 16:14:28 +00:00
Gerald Combs 6550b10422 [Automatic update for 2017-02-12]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I84ecfdd35a8f2935f950f72c01a69b70a6a80c07
Reviewed-on: https://code.wireshark.org/review/20070
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-12 16:12:32 +00:00
Jaap Keuter 1e1ceeb763 Put the definitions first
To help compilers that don't like mixed definitions, put the definitions
first.

Bug: 13398
Change-Id: I7f011feef7c7574df7a03cec87693e664be559ca
Reviewed-on: https://code.wireshark.org/review/20067
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12 13:46:21 +00:00
Guy Harris 6bbbc3456b Fill in pseudo-header fields in order, and add the group ID for 11ac.
Change-Id: I0011917b77b1adc0cb6effd5d9d902f541675d78
Reviewed-on: https://code.wireshark.org/review/20066
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 10:03:36 +00:00
Guy Harris 6a3762576b Add a comment about wired-to-little-endian fields.
Other fields in the Prism header are in the same byte order as the magic
number; if the host generating those fields is big-endian, are these
fields little-endian or big-endian?

Change-Id: Ieb857db3ea63a673d9224cb2a7be3ff2bfb5861c
Reviewed-on: https://code.wireshark.org/review/20065
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 09:52:50 +00:00
Guy Harris e2c92fa99e White space/style cleanup and consistency.
Go with 4-space indentation.

Also, get rid of some unnecessary brackets.

Change-Id: I07b4f126ba58ef3d013db7741d91484ae32e60d7
Reviewed-on: https://code.wireshark.org/review/20064
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 09:46:48 +00:00
Guy Harris 386a286d7d signal() is defined on some UN*Xes; don't use it as a variable name.
Change-Id: Iec68f35eefdc3ce17112c04477eae99e5aa58eb8
Reviewed-on: https://code.wireshark.org/review/20063
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 09:33:08 +00:00
Simon Barber 4125aa14c3 Decode QCA sniffer PRISM extensions, and populate some wlan_radio
fields.

Patch received from QCA, and fixed up to build on master and pass
some fields on to wlan_radio.

Bug: 12978
Change-Id: I65ba7d07fbd76e98bb13399e46b400109387764c
Reviewed-on: https://code.wireshark.org/review/17720
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12 08:38:41 +00:00
Martin Kacer b8ead95375 tshark print_indent function
Modified epan/print.c to use function print_indent

Change-Id: Iefcb1e3c7813919c6af70d57a4f8a6f921595360
Reviewed-on: https://code.wireshark.org/review/20060
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-11 20:09:17 +00:00
S. Shapira a2b48ad120 Fixing the MAC tvb creation in FP's tb dissection method
Bug: 13392
Change-Id: I387a6715164180487606ba3e9e4aaf64695aa543
Reviewed-on: https://code.wireshark.org/review/20050
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-11 14:15:08 +00:00
Peter Wu 6cc7a7031d TLS13: handle Key Update for decryption
Generate new key upon receipt of Key Update message. Untested.
Note that the "traffic_secret" field in SslDecryptSession was unused and
since the client and server have two different encryption states, store
the application traffic secret in SslDecoder.

Change-Id: Iefca3f6cb75745a996fecb0fe7769c876dc9c4ee
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/20013
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11 13:22:56 +00:00
Peter Wu eb1a63f3bc TLS13: add Key Update dissection
Actual decryption support will be added later.

Ping-Bug: 12779
Change-Id: I3ff1f243fd0bd1467e84d8a6a5433c1fe71bbebf
Reviewed-on: https://code.wireshark.org/review/20012
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11 13:22:43 +00:00
Peter Wu 746bbe7abf ssl-utils: add length validation for Certificate handshake message
This also introduces a new macro, "G_MAXUINT24" as symbol for 2^24-1
(this name does not exist in GLib and uncommon in Google).

Change-Id: If000f41f6286161e3a7697357fc33ae16c1e11db
Reviewed-on: https://code.wireshark.org/review/20003
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11 10:47:57 +00:00
Peter Wu b659c76c32 TLS13: fix length of Finished message
Select the full message instead of just the first 12 bytes (as was the
case in previous TLS versions. No check is added since it is too much
work for little gain (it would require looking up the hash length for
the cipher suite).

Change-Id: Iea13d5abe6a7e55b04fabacfa8919a02acd8517d
Reviewed-on: https://code.wireshark.org/review/20011
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11 00:10:14 +00:00