Commit graph

29383 commits

Author SHA1 Message Date
Alexis La Goutte
2c80810898 WCCP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Dead Store include on g38c05061b

Change-Id: Ib29edea664ac6563c0eb9dc21dae168a8cfe6cd6
Reviewed-on: https://code.wireshark.org/review/9748
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-22 21:17:18 +00:00
Pascal Quantin
3f0f49df66 Use pinfo pool and not packet pool for AT_STRINGZ addresses
Change-Id: I474e6554b352147702eac32d5574f8ab4a1ab84d
Reviewed-on: https://code.wireshark.org/review/9745
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: Anders Broman <a.broman58@gmail.com>
2015-07-22 12:50:25 +00:00
Luke Mewburn
83dc308f36 PCLI: Expand protocol support
1. Implement "Decode As" for PCLI payload instead of assuming IP.
   Currently supported subdissectors are Ethernet and IP.

2. Implement multiple "flavors" of PCLI with different header formats:
        pcli: 4 byte CCCID
        pcli8: 8 byte header (including CCCID)
        pcli12: 4 byte CCCID, 8 byte NTP timestamp
        pcli20: 4 byte CCCID, 8 byte NTP timestamp, 8 byte case ID
   All flavors currently using "Decode As" for payload.

3. Optionally append CCCID to protocol item in tree
   using preference "pcli.summary_in_tree".

4. Obsolete preference "pcli.udp_port".

Bug: 9266
Bug: 11220

Change-Id: Ie4bca06665985ef1eb77db767771a5a82357e242
Reviewed-on: https://code.wireshark.org/review/8608
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-22 01:28:45 +00:00
Hauke Mehrtens
e8f24f319e coap: fix decoding of observe extension
The observe draft changed and now the option value does not contain the
lifetime anymore, but the value encodes if a user wants to register or
deregister.

Change-Id: I3719101c2bed87c956eb24056be40c9a79dafac8
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/9638
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: Michael Mann <mmann78@netscape.net>
2015-07-21 21:52:35 +00:00
Guy Harris
868cd67915 Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().
Hand it a table of version/procedure table/hf-for-program-number
triplets.

Change-Id: I2acc03c2da83353165bd422d8537362201c814e2
Reviewed-on: https://code.wireshark.org/review/9740
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21 19:38:15 +00:00
Pascal Quantin
573b33a5a3 LTE RRC: fix a typo
Let's have consistent naming for dissectors

Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f
Reviewed-on: https://code.wireshark.org/review/9737
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-21 15:30:32 +00:00
Robert Beardsworth
3e29fc5147 MQ: fix dissection of Work Information Header Reserved field
Bug: 11384
Change-Id: If8c2010b38f65b8ee8569e2d2eee1554d6fdee9c
Reviewed-on: https://code.wireshark.org/review/9724
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>
2015-07-21 05:26:02 +00:00
Guy Harris
70d1c7238f Don't make dummy RPC program entries.
Just hand the payload off to the data dissector.

Change-Id: I59a61ec6352ef0b0c51382d68ca23b00010eb723
Reviewed-on: https://code.wireshark.org/review/9733
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21 05:05:35 +00:00
Guy Harris
e48ab48c3f Allow EUI-64s to be specified as numbers or byte strings.
They are, after all, really byte strings, just as MAC-48s/EUI-48s are.

Clean up some of the integer <-> byte-string trickery a bit, using
unions rather than pointer punning.

Bug: 11380
Change-Id: I0d9aa3ca7bb6b7e4c75e49a11b13d3d0e5a04473
Reviewed-on: https://code.wireshark.org/review/9727
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-20 22:20:26 +00:00
Michal Labedzki
1e487664bc Qt: Add option to back white line separator for packet list items
This uses one line (on bottom) of items and makes it white.
Seen in Wireshark on some configurations of GTK 2 on Linux,
so backports it to Qt for people who like it.

In my opinion it helps if you use packet list background colors
for frames and you have a lot of following frames with
the same background color.

Bug: 10954
Change-Id: Id8f58520d7224db4eb8181bcc04febd7416a8578
Reviewed-on: https://code.wireshark.org/review/7293
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-20 21:21:28 +00:00
Pascal Quantin
eb1ccbdccd Protect dissector_get_(default_)string_handle() against NULL input string
Bug: 11381
Change-Id: Ib102a23b3d840144757ce692312ff13009c5c95e
Reviewed-on: https://code.wireshark.org/review/9717
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>
2015-07-20 19:25:38 +00:00
Pascal Quantin
54812f264b MAC LTE: indicate explicitly that UL LCID 11 is used for Category 0 devices
Change-Id: Ia9a046c8aebdefad0303bed995c19f5408e4460b
Reviewed-on: https://code.wireshark.org/review/9719
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-20 18:05:28 +00:00
Guy Harris
170def9511 Fix escaping of strings in UATs.
Not only must characters that aren't printable ASCII characters be
escaped, backslashes must be escaped (as backslash is an escape
introducer) and double-quotes must be escaped (as double-quotes
encapsulate strings).

When constructing a string to hand to uat_load_str(), escape pathnames,
as they are likely to contain backslashes on Windows, could contain
backslashes on UN*X, and could contain quotes on UN*X and possibly
Windows.  (Arguably, we should escape all the string arguments

Bug: 11372
Change-Id: I594840327fa41895130903c3c612ba97d6c29df3
Reviewed-on: https://code.wireshark.org/review/9716
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-20 17:02:59 +00:00
Pascal Quantin
09ae055f23 GTPv2: always set direction before dissecting PCO IE
Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown
Bug: 11378

Change-Id: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043
Reviewed-on: https://code.wireshark.org/review/9710
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>
2015-07-20 13:19:37 +00:00
Martin Kaiser
030da2a611 coverity 1250812: fix a (very unlikely) integer overflow
Change-Id: I151cb2186c7dabbab1bef5cd35dabe19a3600dfd
Reviewed-on: https://code.wireshark.org/review/9703
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-19 21:05:13 +00:00
Pascal Quantin
21b99e3ece Remove functions that got reintroduced by error in g21e5a95
Change-Id: I5e5956727641be3e377109dd032da76f6b21c481
Reviewed-on: https://code.wireshark.org/review/9707
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-19 20:26:46 +00:00
Joerg Mayer
0809a4e086 Looks like automatic update 0907a6ebb8
didn't work as expected for epan/dissectors/usb.c
Revert that file for now.

Change-Id: I7ebbc860e2e4a93f086fc3e53138f3272814d5f0
Reviewed-on: https://code.wireshark.org/review/9705
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-19 20:00:21 +00:00
Gerald Combs
0907a6ebb8 [Automatic update for 2015-07-19]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I43c44e68e802ed2ab595714ecaf072d941c852ad
Reviewed-on: https://code.wireshark.org/review/9701
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-19 15:10:10 +00:00
Guy Harris
26c95e8857 Get rid of trailing whitespace.
Change-Id: Ifd39e84284be5701c67173da09be12266ef93e25
Reviewed-on: https://code.wireshark.org/review/9700
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-19 06:25:22 +00:00
Guy Harris
7e817aeb3a Require dissectors for all ONC RPC calls and replies.
Either there's a known body for the call or reply, in which case we
already have a dissector for it, or the body is empty, in which case we
now have dissect_rpc_void() to dissect it, or the body is unknown or
nobody's bothered writing it, in which case we use dissect_rpc_unknown()
for now.

This means that an attempt to look up the dissector for a known
procedure will always succeed, so we can label it with the name rather
than with "proc-N".

It also means that we distinguish between "it's void" and "it's
unknown", so that unknown values will get flagged as such.

Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541
Reviewed-on: https://code.wireshark.org/review/9699
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-19 06:24:18 +00:00
Joerg Mayer
eea54a060d Enable decryption by default
Change-Id: Ife299ec6b56e6a158ed76413d7f2a8e760824a01
Reviewed-on: https://code.wireshark.org/review/9696
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-18 08:05:28 +00:00
Peter Wu
5038efd13f ssl-utils: do not check for empty keylog filenames
If ssl.keylog_file is not configured, an empty string is set. In that
case, do not attempt to open the keylog file.

Change-Id: I2ba4b9dbc7cfb5009d2623c49a129e98734df80f
Reviewed-on: https://code.wireshark.org/review/9688
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17 18:28:55 +00:00
Michael Mann
38c05061ba WCCP - remove global variable used to store address information for computation later.
Change-Id: I06841ec77cf9f34914b9dfe10b8cd35824b32b71
Reviewed-on: https://code.wireshark.org/review/9647
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 17:20:54 +00:00
Michael Mann
21e5a950ad Remove all preferences related to enabling/disabling heuristic dissectors.
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector.

Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled.

Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22
Reviewed-on: https://code.wireshark.org/review/9610
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 17:12:22 +00:00
Alexis La Goutte
5bd6c4aff2 STUN: Add missing error codes
Bug:11350
Change-Id: I8876f7b088229b7b60b2e5d81b70e2e762cad044
Reviewed-on: https://code.wireshark.org/review/9644
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-17 16:34:50 +00:00
Pascal Quantin
cbdd102343 Pacify Windows buildbots
Change-Id: I6e1db78ca42d7995e0309dd5d43e2abaf1e3b55e
Reviewed-on: https://code.wireshark.org/review/9691
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-17 16:05:29 +00:00
Michal Labedzki
3faec795e9 Qt/Bluetooth: Add HCI Summary dialogue
HCI Summary dialogue collect HCI Opcodes, HCI Events, Hardware Errors,
Statuses and Reasons. Also show occurrence of them. The top level item
is group of items (by OGF or types), the second level item is in real
command, event, hardware error, status or reason. The third level items
are direct link to packet that contains second level item type.

Change-Id: I6b6bd02533c4605a2dd2c1f5dfee46f72a0f3fdc
Reviewed-on: https://code.wireshark.org/review/9676
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17 13:54:43 +00:00
Michael Mann
6514dece0c Add preference for disabling 'packet size limited during capture' message in Info column.
Bug: 9827
Change-Id: I8fdba4827b164bd231981bfdd2e1bd0499f4f87c
Reviewed-on: https://code.wireshark.org/review/9669
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 11:29:08 +00:00
Michael Mann
b1eaf29d40 WCCP - Only populate address table once and presume first address table type is the one that should populate it.
Ping-Bug: 11358
Change-Id: Ieed093b4aa263026772450f95dd5fa18280f9b76
Reviewed-on: https://code.wireshark.org/review/9648
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 11:28:17 +00:00
Jim Young
ad82dfd554 Add new long options to GUIs to allow arbitrary protocols and heuristics to be disabled via command-line
Future: Allow multiple protocols to be disabled in one option statement
(perhaps using a comma or colon delmited set of names in <proto_name>)
instead of having to specify --disable-protocol <proto_name> multiple times.

Change-Id: I9b8f960acf75298ebb098d9b667fca49dca52306
Reviewed-on: https://code.wireshark.org/review/9631
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 11:27:52 +00:00
Guy Harris
9d24a26c9b Don't register in a non-existent dissector table.
There's no "btrfcomm.channel" dissector table any more; there's a
"btrfcomm.dlci" table.

Change-Id: Ia7cdf45c04b6b116a67ef4b7dfdce509cdb15327
Reviewed-on: https://code.wireshark.org/review/9684
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17 11:17:12 +00:00
Michael Mann
477b49e372 The pflog spec appears to have some host-endian field values. Since we don't know the platform the host could be, setup preference to decode fields as big or little endian.
Bug: 10202
Change-Id: Ic550d75a853eca7abd162241b8426ab196ba0d12
Reviewed-on: https://code.wireshark.org/review/9671
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-17 10:17:40 +00:00
Guy Harris
d1fcb7dd34 Report an error if we fail to open the keylog file.
That way, we don't just silently fail.

Change-Id: I924f4387f6efdc342f6b02ed29796802567c1884
Reviewed-on: https://code.wireshark.org/review/9683
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17 09:02:24 +00:00
Michal Labedzki
5a9e438b05 Bluetooth: RFCOMM: Replace Decode by Channel by DLCI
Channel is not enough to decode streams over RFCOMM. DLCI is.
DLCI is Channel and Direction bit that can be used to recognize
which side RFCOMM service (channel) is - remote or local side.
Direction bit is first bit in DLCI so: DLCI = Channel < 1 | Direction.

Change-Id: I56a641cfd2d4495d119f08ded1aab5cead458e17
Reviewed-on: https://code.wireshark.org/review/9679
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17 08:06:57 +00:00
Michal Labedzki
dac7cf9f8c Bluetooth: Add generic UUID table for DecodeBy
Replace L2CAP Service, RFCOMM Service and AVCTP PID dissector table
by shared Bluetooth Service UUID table. It also supports UUID16,
UUID32 and UUID128 by hex-string, like for AVRCP: "110e".

Change-Id: I473bc73d10939e8ed6dd55a6a92387c7a1ec125a
Reviewed-on: https://code.wireshark.org/review/9678
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17 08:06:40 +00:00
Evan Huus
eaf1aad31e wmem: don't remove tiny blocks from the recycler
They were never put in it in the first place because they can't hold the
necessary pointers.

Bug: 11373
Change-Id: I9e2ec76850929b5ac86e6f7a344d70f56ad3911c
Reviewed-on: https://code.wireshark.org/review/9672
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-17 02:37:13 +00:00
Peter Wu
b99f10bea7 ssl-utils: fix RSA keys with GnuTLS 2.12.23
Apparently GnuTLS 2.12.23 as used on Ubuntu 14.04 produces different
outputs for the u parameter as observed in gdb. GnuTLS 3.4.2 on Arch
Linux works fine. Workaround this issue by unconditionally calculating
the inverse.

Change-Id: I8406352f8c570b355ea774cafc903662d06888ac
Fixes: v1.99.8rc0-417-g85f8a99
Bug: 11371
Reviewed-on: https://code.wireshark.org/review/9666
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-07-16 23:13:33 +00:00
Alexis La Goutte
3e059c9d1f SMB2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ic7d713e8593cd0841089f2c26d2c24f2f008cb31
Reviewed-on: https://code.wireshark.org/review/9667
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-16 21:52:54 +00:00
Guy Harris
b1e0f439e1 One definition of the same typedef suffices.
Change-Id: Ic221bf911f6de9bc94278350e0642143d14f6e82
Reviewed-on: https://code.wireshark.org/review/9662
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-16 18:48:37 +00:00
Pascal Quantin
0801cd399f DTLS: fix compilation without libgcrypt or libgnutls
Change-Id: I571f1ddaaa9579af65d558afc7162493a7393703
Reviewed-on: https://code.wireshark.org/review/9661
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-16 17:29:33 +00:00
Richard Sharpe
6fcfb5ed56 Add support to the SMB2 protocol for one of the proposals for POSIX Extensions
to the SMB2 protocol.

I am submitting this purely so that it is available for others to play with.

Change-Id: I379b9da90731cc61ce38a1fdf21dc7c09d0d114e
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/9496
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-16 17:29:31 +00:00
Pascal Quantin
da914431ce LTE RRC: fix dissection of ETWS/CMAS warning messages
Change-Id: I20bb219a32b6c7e39ac415c5c13ad5379f78cba2
Reviewed-on: https://code.wireshark.org/review/9658
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-16 16:56:43 +00:00
Pascal Quantin
78bc3dd93a GSM RLC/MAC: fix an infinite loop when analyzing (E)GPRS header
Change-Id: Ibba32a2860f80979ee9df3caeeaeda14fde7e7d0
Ping-Bug: 11358
Reviewed-on: https://code.wireshark.org/review/9649
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-16 05:36:31 +00:00
Gerald Combs
d2acb04b4c Add the RTP Stream Analysis dialog.
Combine the GTK+ RTP Stream Analysis and RTP Graph Analysis dialogs into
one. Yell at the user less. Disable the Analyze RTP Stream menu item if
we don't have an RTP stream selected.

There are a *lot* of moving parts in this dialog. I've tested with the
few RTP captures I have but it's by no means complete.

"To do" items are listed at the top of rtp_analysis.cpp.

Change-Id: Id503977f069bebc46cc68bc749f0c9cbf4d37bf6
Reviewed-on: https://code.wireshark.org/review/9650
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-16 00:30:14 +00:00
Michael Mann
5523726e69 WaveAgent - Use tvb_get_guint8 instead of tvb_get_ptr to walk a packet and protect against a really big tag value
Ping-Bug: 11358
Change-Id: I9ecb5fe6bcd7f25c763d968bf56fb2d9bce2180c
Reviewed-on: https://code.wireshark.org/review/9639
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-15 23:22:28 +00:00
Peter Wu
85f8a99f35 ssl-utils: fix failing decryption for some RSA keys
Reported at
https://ask.wireshark.org/questions/43788/struggling-to-decrypt-ssl

"u" requirement is documented at
https://www.gnupg.org/documentation/manuals/gcrypt/RSA-key-parameters.html#RSA-key-parameters

Add regression test (key is generated manually with p and q swapped and
qInv recalculated).

Change-Id: I5505ddcdb54bb47d7a58867b8c3e53fcc0f66dde
Reviewed-on: https://code.wireshark.org/review/9573
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-07-15 21:31:44 +00:00
Peter Wu
79be8312da ssl-utils: remove unused, broken libgcrypt code
Remove unused SSL_FAST code. That approach cannot work in modern
libgcrypt anyway since the symbols were renamed and private to
libgcrypt. The RSA decryption routine is not even a hot path, it is only
called for decrypting the encrypted pre-master secret.

While at it, expand the SSL_PRIVATE_KEY macro and remove its definition.

Change-Id: Ied556d18501ea6cbac5fb27218364b3479ad62ce
Reviewed-on: https://code.wireshark.org/review/9572
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-07-15 21:30:40 +00:00
Martin Kaiser
c8c8eefb47 zvt: handle multi-byte tags
and dissect the components of a tag
add a global true-false string for constructed vs. primitive

Change-Id: If10ecf97cde59e2be9ff5e3163073f6d14e6c61e
Reviewed-on: https://code.wireshark.org/review/9636
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-07-15 20:15:55 +00:00
Pascal Quantin
79774329d7 Simply code for export of PDUs coming from heuristic dissectors
Let's use the newly introduced find_heur_dissector_by_unique_short_name() function

Change-Id: I5781b9b2f1ab679da07e97755b71840b4b3a9361
Reviewed-on: https://code.wireshark.org/review/9645
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>
2015-07-15 18:30:57 +00:00
Michael Mann
828358d22c Openflow - prevent infinite loop
Change-Id: I93ce7151467c890c12f7d612b5a7eecf5f91c189
Ping-Bug: 11358
Reviewed-on: https://code.wireshark.org/review/9640
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: Michael Mann <mmann78@netscape.net>
2015-07-15 11:27:41 +00:00