Commit graph

1221 commits

Author SHA1 Message Date
Pascal Quantin
31abf81250 Windows: upgrade Npcap to 0.9983
Change-Id: I05a0eb274d8890711d47c95db1b925682baa63cd
Reviewed-on: https://code.wireshark.org/review/34457
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-05 22:03:15 +00:00
Piotr Smolinski
ad94c4d459 Kafka: include zstd compression in Kafka message batches
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777
Reviewed-on: https://code.wireshark.org/review/34222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-20 13:50:45 +00:00
Pascal Quantin
3eea735cc1 Windows: upgrade Npcap to 0.9982, USBPcap to 1.5.3.0 and nghttp2 to 1.39.2
Change-Id: I9dcff1c6714c6bbe211997195ff78537c334fdbd
Reviewed-on: https://code.wireshark.org/review/34303
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-16 17:39:49 +00:00
Peter Wu
a537edfdff Diameter: Add MS-CHAP/MS-CHAPv2 AVP support for EAP-TLS
Created the Microsoft Diameter file based on MS-CHAP-* AVPs listed at
https://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-10
Many values are displayed as bytes for simplicit. The MS-CHAP2-Success
attribute could for example be dissected further as 1 byte followed by a
string, but that requires more effort.

Allow padding to be missing since the eap-ttls-mschapv2.pcapng capture
would throw a Malformed Packet exception otherwise.

Bug: 15603
Change-Id: I9efc322a86802e78bb6cd4bc3df1c1282a45fe9e
Reviewed-on: https://code.wireshark.org/review/34291
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15 04:10:16 +00:00
Guy Harris
245086eb83 HTTPS In Still More Places, update more URLs.
Microsoft reshuffled their documentation - almost all of it moved from
msdn.microsoft.com to docs.microsoft.com.  Some blogs moved to
devblogs.microsoft.com; the comments *didn't* move, so in one case we go
to the Wayback Machine - the link isn't dead, but it formats horribly,
at least on my browser, but the archived version formats OK.

Use the Wayback Machine for some URLs, and update others.

Update the sections for MS-ADTS.

Point to the HTML versions of some RFCs and I-Ds.

Change-Id: I344b20f880de63f1ae2a4e3f9ff98af78a7fe139
Reviewed-on: https://code.wireshark.org/review/34101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 22:56:35 +00:00
Guy Harris
cdee223c32 Remove trailing space.
Change-Id: I6dd49a21c76e9a126a40872a08ce1dc13aefc195
Reviewed-on: https://code.wireshark.org/review/34097
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 08:46:41 +00:00
Guy Harris
5cf3fd03f1 HTTPS In More Places, update some URLs.
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:55:36 +00:00
Guy Harris
20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Gerald Combs
5fd0f06bc7 Windows+CMake: Updates for Visual Studio 2019.
Update our redistributable search logic for VS 2019.

Change-Id: Icccc550bbe062a91206d4ffddeef7bbfbdb8829b
Reviewed-on: https://code.wireshark.org/review/34064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-24 06:13:17 +00:00
Peter Wu
36e1f782aa epan,packaging: convert http URLs to https
Ensure that public text in error messages and dialogs point to https.
Ensure that the generated PDML files include scripts over https.

Change-Id: I75d42704c2bbb33b05492261b3e1d45dc6e301f9
Reviewed-on: https://code.wireshark.org/review/34027
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-20 20:50:59 +00:00
Gerald Combs
b28ae2dc74 macOS: Fix our token wait. Again.
altool isn't guaranteed to clean up after itself, e.g. if an earthquake
takes down the Developer ID Notary Service (thanks to Jim Young for
tracking this down). Instead of checking for the existence of tokens,
check their existence and age.

Change-Id: Iac216d524a4894115ecf33589af1bbdebcc9cbab
Reviewed-on: https://code.wireshark.org/review/33856
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-05 16:12:52 +00:00
Pascal Quantin
97d47139bc Windows: upgrade USBPcap to 1.5.2.0
Change-Id: I06b7e507277af2c8cdf76dfeaf0b5347a56a0eae
Reviewed-on: https://code.wireshark.org/review/33833
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-07-03 20:56:30 +00:00
Pascal Quantin
ddfb6e3901 Windows: upgrade USBPcap to 1.5.1.0
Change-Id: Id376763c07ba97dc7105f7265a6ebb3d30a9adbf
Reviewed-on: https://code.wireshark.org/review/33824
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-03 03:49:08 +00:00
Gerald Combs
8094ad896b macOS: Fix our token wait.
Change-Id: I3a678267b38a598f43322a1440dd87fa42acf901
Reviewed-on: https://code.wireshark.org/review/33750
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-26 23:30:17 +00:00
Gerald Combs
d9e230d79a macOS: Add a notarization upload wait check.
altool appears to only support one notarization upload at a time. Add a
loop that waits for an empty upload token directory.

Convert the status check to a timeout loop.

Change-Id: I30fd15b6f098acfe5d9bdcd72237c56cc066dda4
Reviewed-on: https://code.wireshark.org/review/33749
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-26 23:15:04 +00:00
Gerald Combs
e5230a5d10 macOS: Make sure we bundle our plugin dependencies.
Add our plugins to the bundle binary list.

Copy libraries using `install` in order to ensure that we can doctor
them up.

Bug: 15867
Change-Id: I864455f6ef7312938e89493015fd55874ab0a0c3
Reviewed-on: https://code.wireshark.org/review/33744
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-26 16:13:57 +00:00
Gerald Combs
867a13d9e6 Fix a couple of shellcheck issues.
Change-Id: Iaebbe5227ffcc581e794a3be1f8b9020fd600f68
Reviewed-on: https://code.wireshark.org/review/33739
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-25 15:13:51 +00:00
Pascal Quantin
6b20a4f2d6 Windows: upgrade Npcap to 0.996 and USBPcap to 1.5.0.0
Change-Id: Ie6590e1a31a5aaa6e96f6f718991cc42a1e40d8a
Reviewed-on: https://code.wireshark.org/review/33639
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-18 06:20:10 +00:00
Pascal Quantin
5df1294de2 wix: fix packaging of various plugins
Change-Id: I4ae23792abe2409ab833802b9d7dffc076234db5
Reviewed-on: https://code.wireshark.org/review/33563
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11 22:23:59 +00:00
Pascal Quantin
8a1a63d7c9 Windows: package codec plugins
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24
Reviewed-on: https://code.wireshark.org/review/33562
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11 22:06:19 +00:00
João Valverde
63af1da7e7 Kill libwscodecs plugin library, just use plugins
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11 20:59:39 +00:00
akuchekar
bcfe022d22 New Diameter AVPS
Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0
Reviewed-on: https://code.wireshark.org/review/33461
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-08 14:32:28 +00:00
Pascal Quantin
c603fac072 Windows: upgrade USBPcap to 1.4.1.0
Change-Id: I1a9d97a58201dadc6c50a15d1518053c980bd62f
Reviewed-on: https://code.wireshark.org/review/33514
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-07 05:33:46 +00:00
Gerald Combs
332eeb1f88 macOS: Notarization count fix.
Change-Id: If2be00ebf08655d967273ae3a84f4345ea10f06a
Reviewed-on: https://code.wireshark.org/review/33435
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-31 20:58:02 +00:00
Gerald Combs
23ec0666c5 macOS: Notarization updates.
Increase our timeout from 10 minutes to 20. Fixup our ID formatting.

Change-Id: I143c08880de4f285bd0bc6dbf6619d565ef97b3a
Reviewed-on: https://code.wireshark.org/review/33434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-31 17:29:54 +00:00
Pascal Quantin
76785a12b3 Windows: upgrade USBPcap to 1.4.0.0
Change-Id: I79b8ece52e89e4e646954e965649b0cf5ae69a6a
Reviewed-on: https://code.wireshark.org/review/33379
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-26 21:19:52 +00:00
Pascal Quantin
3586da308f Windows: upgrade Npcap to 0.995
Change-Id: I9e1bea5daf8aa49e4de4efa070819da8d3844fc1
Reviewed-on: https://code.wireshark.org/review/33156
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-11 13:17:00 +00:00
Pascal Quantin
fd2f439e33 Revert "Windows: upgrade Npcap to 0.994"
This reverts commit 2f82518f72.

Npcap 0.994 introduced a crash that will be fixed in next version:
https://github.com/nmap/nmap/issues/1591

Change-Id: Iff9a29e6d28c57774844d25f2990e0f8c214bf75
Reviewed-on: https://code.wireshark.org/review/33143
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10 05:38:32 +00:00
Pascal Quantin
2f82518f72 Windows: upgrade Npcap to 0.994
Change-Id: I3b64041723a72600a9ef5a6fb9d22b0b30578cfc
Reviewed-on: https://code.wireshark.org/review/33114
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08 16:04:38 +00:00
Pascal Quantin
48d7cecedd Windows: upgrade Npcap to 0.993
Change-Id: Ibe19a77b5ced8be4f1008450fb6df92c841a43c5
Reviewed-on: https://code.wireshark.org/review/33092
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-07 05:12:08 +00:00
Gerald Combs
64a56cf7a6 macOS: Add a workaround for libbrotli.
When gathering our dependencies, work around an issue with libbrotli's
install name similar to what we do with libssh.

Bug: 15730
Change-Id: I571746848e3343d81c286be66f6fe6510c698d6f
Reviewed-on: https://code.wireshark.org/review/32990
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-26 00:30:45 +00:00
Alexis La Goutte
c3cd3abc82 NSIS/WIX: fix BROTLI packaging (missing DLL)
Change-Id: Iaacee6f2f91f66b2ca044f4d4082c6993f16a1dc
Reviewed-on: https://code.wireshark.org/review/32957
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-23 11:55:03 +00:00
Gerald Combs
44cc03e4fb CMake+WiX: Add a note about merge module deprecation.
Change-Id: I2dd2b70e218b50cb43d47200de28b9d7d2e48abd
Reviewed-on: https://code.wireshark.org/review/32942
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-22 16:42:28 +00:00
Dániel Bakai
9ce60b173b Add brotli decompression support for HTTP and HTTP2 dissectors.
Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03
Reviewed-on: https://code.wireshark.org/review/32745
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 15:24:46 +00:00
Dániel Bakai
c77ee0008d rpm: update rpm package dependencies and spec to work on current os versions
Change-Id: Iaa0bd9513869e65b96b6014d66ca3cfd917dbe64
Reviewed-on: https://code.wireshark.org/review/32938
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 13:21:37 +00:00
Gerald Combs
c9ca78fc2b macOS: Add a notarization script.
According to

https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution

notarization will be required in a future release of macOS. Add a script
for doing so. The process requires submitting our .dmg to Apple, waiting
for it to finish, and stapling a ticket to our .dmg.

Change-Id: I5b9c0c36cc2182fdd0baeada823aaacba7730a88
Reviewed-on: https://code.wireshark.org/review/32906
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-21 07:32:29 +00:00
Peter Wu
3af6db7dde RPM: fix build since GLIB2_MIN_VERSION was removed
Instead of reintroducing the variable, inline the version. This matches
with other version checks in the same file and debian/control.

Change-Id: I4dc178575b8f24e7f8e07e8d761e245f14c65ffa
Fixes: v3.1.0rc0-566-g8c26217548 ("CMake: bail out if minimum GLib version is not satisfied")
Reviewed-on: https://code.wireshark.org/review/32917
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-20 22:34:54 +00:00
Ethan Everett
4591286d3a radius: add Meraki dictionary
Change-Id: Ibba2254bd9711b9cbac2d8f3ef2e209ccdc45bc0
Reviewed-on: https://code.wireshark.org/review/32621
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-10 21:11:00 +00:00
Gerald Combs
6fc00612b4 macOS: Update a comment in osx-app.sh.in.
The answer to the question "do we need to add hardened runtime
entitlements or exceptions?" in osx-app.sh is "yes". Update a comment
accordingly.

Change-Id: Icc6f9ed31838aa6342f405a244e726586e9c0c4d
Reviewed-on: https://code.wireshark.org/review/32703
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-03 20:31:43 +00:00
Jason Cohen
00e2434a6f osx app bundle: add entitlement to allow loading 3rd party plugns
This adds the entitlement to everything we sign.  I cannot test a more
granular approach without access to an Apple issued codesigning cert/key
pair.

Bug: 15667
Change-Id: I9fe962a06b681d33853b0944765987e21d21be2d
Reviewed-on: https://code.wireshark.org/review/32700
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-03 20:24:12 +00:00
Pascal Quantin
711ac47896 Windows: upgrade USBPcap to 1.3.0.0 and Npcap to 0.992
Change-Id: Ie27c2cb36dc90a20851f1e2c53c1af2220465a39
Reviewed-on: https://code.wireshark.org/review/32678
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-02 03:27:41 +00:00
Gerald Combs
029f24e4cf macOS: Restore dark mode support.
Comment out the NSRequiresAquaSystemAppearance key in Info.plist under
the assumption that both we and Qt will have dark mode support in usable
shape by the next release.

Ping-Bug: 15511
Change-Id: Ic5960034ce302d81dcc624cbd0e2c017865f44e2
Reviewed-on: https://code.wireshark.org/review/32504
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-22 05:18:09 +00:00
João Valverde
c7c3e31772 NSIS: Add logic to package Qt debug DLLs
Bug: 15623
Change-Id: I4898fe2797d987e35bc334211ece8f2f58c562c7
Reviewed-on: https://code.wireshark.org/review/32493
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-21 05:06:34 +00:00
Gerald Combs
fff15ba974 WiX: Fix another libxml2 variable.
Change-Id: If032c0876ab2ba80b8df7b84e1e1c8e8f1ac425c
Reviewed-on: https://code.wireshark.org/review/32490
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-20 17:19:03 +00:00
Pascal Quantin
9d44b75999 Windows: fix addition of Libxml2 DLLs in installers
Follow-up of gacc96e5206

Change-Id: Ibf49c4812b46ed282dccddb4fe6869154f6f9fed
Reviewed-on: https://code.wireshark.org/review/32487
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-03-20 08:07:54 +00:00
Gerald Combs
a6da14982b NSIS: Fix our extra installer location.
We know the native Windows library path early on in the configure
process. Use it to set the location of the Npcap and USBPcap installers
instead of trying to derive it from the GLib DLL path.

Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
Reviewed-on: https://code.wireshark.org/review/32475
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 23:47:38 +00:00
Gerald Combs
36ba6b87c1 Windows: Switch to Npcap 0.991.
Change-Id: I4f5d82bf0d205b9410db2098abe64dde1a33b21d
Reviewed-on: https://code.wireshark.org/review/32473
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 22:46:46 +00:00
Gerald Combs
a0c93f426b CMake: Don't build Windows package targets by default.
Explicitly exclude our various Windows package targets from the Visual
Studio default build. This will hopefully keep the 32-bit Windows builder
from trying to build the portableapps_runtime target when it shouldn't.

Change-Id: Id8481e92abda9b1a4784b8c8e8b5a1b3f1b4647e
Reviewed-on: https://code.wireshark.org/review/32256
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-28 16:37:07 +00:00
Gerald Combs
1b10ac9bd4 macOS: Replace Wireshark.app when upgrading.
The packages that PackageMaker creates don't remove old files when
upgrading. Add a preflight script that removes Wireshark.app if it
exists.

Fix a version check while we're here.

Change-Id: I8be8cbf51b34fef8a2d4259478b7d3199d976de3
Reviewed-on: https://code.wireshark.org/review/32150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-22 19:36:20 +00:00
Gerald Combs
2172fe93e1 macOS: Fixup our libssh workaround.
On the previous builder, `otool -L /path/to/libssh.4.dylib` returned a
bare "libssh.4.dylib", which required a workaround. On the new builder
it returns "@rpath/libssh.4.dylib". Adjust the workaround accordinly.

Remove a couple of chmods while we're here. Permission issues are better
addressed elsewhere.

Change-Id: If0692219d9558c77b45620e7aad309853012b7e8
Reviewed-on: https://code.wireshark.org/review/32059
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-17 16:46:35 +00:00