tools/wireshark, branch wireshark-1.12.9

Build 1.12.9.

2015-12-29T18:31:46+00:00

Change-Id: I67fba5f18ef5fd5a6c4024fa01a4faf64ec159f6
Reviewed-on: https://code.wireshark.org/review/12921
Reviewed-by: Gerald Combs

Prep for 1.12.9.

2015-12-28T21:49:39+00:00

Change-Id: I152fc288a3bf4861b2cdf9ceca59e3ba10d2bfaf
Reviewed-on: https://code.wireshark.org/review/12889
Reviewed-by: Gerald Combs

[Automatic update for 2015-12-27]

2015-12-27T16:24:36+00:00

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I222bc2b24324e40a48a60d8d2fa56b47ae39ec54
Reviewed-on: https://code.wireshark.org/review/12878
Reviewed-by: Gerald Combs

[mp2t] adaptation_field_control for NULL packets should not be 0

2015-12-23T17:18:40+00:00

just remove the wrong statement, I'll add some expert info later...

Bug: 11921
Change-Id: I1a4f2e32e9c7c32c54b251445f8750d7c3f5ab6f
Reviewed-on: https://code.wireshark.org/review/12850
Reviewed-by: Martin Kaiser 
(cherry picked from commit 1308189348b43e3ec1cfea13bc66060a844edd3d)
Reviewed-on: https://code.wireshark.org/review/12852

Don't use run_and_catch_crashes.

2015-12-22T01:53:09+00:00

The 1.12 tree doesn't have it.

Change-Id: Idb63bcf061e3e4ced6645f54254b18f350cdf8fb
Reviewed-on: https://code.wireshark.org/review/12817
Reviewed-by: Guy Harris

Don't write out statistics if we don't have any.

2015-12-21T22:03:59+00:00

We don't know when the capture started or ended (the time stamps of the
first and last packets aren't necessarily the time when the capture
started or ended), we don't know how many packets were dropped in the
capture process, and we don't know how many packets were seen in various
stages before they were received by whatever software dumped them out as
text, so we have no statistics to report.

Change-Id: Ic6de25242d2ea536f0f17a1a20a4e05cf03d8416
Reviewed-on: https://code.wireshark.org/review/12813
Reviewed-by: Guy Harris 
(cherry picked from commit 2052db228c7fa76146517b6c3822ea47f7b3f3de)
Reviewed-on: https://code.wireshark.org/review/12814

This now needs the new .

2015-12-21T21:38:52+00:00

Change-Id: I41d30ecbffae4e83933e02616daf0d09bce9eabe
Reviewed-on: https://code.wireshark.org/review/12811
Reviewed-by: Guy Harris

Always free the decrypted key in AirPDcapDecryptWPABroadcastKey().

2015-12-21T21:01:01+00:00

If we've allocated it, free it before we return, even if we return an
error.

Also, zero it out when we allocate it.

Change-Id: I105671074ea007720c0038ec897be7702f486783
Reviewed-on: https://code.wireshark.org/review/12810
Reviewed-by: Guy Harris

g_mallocate the encrypted key, but free it in all paths out of the function.

2015-12-21T20:45:35+00:00

It doesn't need to persist after the function returns.

Change-Id: Ic601a6ef6a0aa0f22f9c8b9a1c586cec95093f27
Reviewed-on: https://code.wireshark.org/review/12805
Reviewed-by: Guy Harris 
(cherry picked from commit 6ede7d4ba3d7acaf90846618afd0830a57511b64)
Reviewed-on: https://code.wireshark.org/review/12807

WPA (IEEE802.11) decryption function cleanups

2015-12-21T20:29:05+00:00

 - Updated AirPDcapPacketProcess function description
 - Try to return better error codes
 - Remove broken/useless return of keys from AirPDcapRsna4WHandshake

Change-Id: I706c129a29016ab1499f1b2fa243da8b70ba6bfb
Reviewed-on: https://code.wireshark.org/review/12804
Reviewed-by: Guy Harris