diff --git a/SIGNATURES-4.2.8.txt b/SIGNATURES-4.2.8.txt deleted file mode 100644 index e0c72d950f7173d7d35185ca9ca318b918276013..0000000000000000000000000000000000000000 --- a/SIGNATURES-4.2.8.txt +++ /dev/null @@ -1,53 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-4.2.8.tar.xz: 45032832 bytes -SHA256(wireshark-4.2.8.tar.xz)=bd320a15a0457936b22031d83cce85e2d14d90b520408e2b64d53c07d94b1b74 -SHA1(wireshark-4.2.8.tar.xz)=712ebb5711f365d42508760218fac2f2c34c7729 - -Wireshark-4.2.8-x64.exe: 86491808 bytes -SHA256(Wireshark-4.2.8-x64.exe)=e7939c3eb37133376380a99043afb6782ea7eec0747ee534cca7d53e8d4ed789 -SHA1(Wireshark-4.2.8-x64.exe)=a5ebb02e21ab251a070a3e2ae95c4bb8e55b3249 - -Wireshark-4.2.8-arm64.exe: 68063712 bytes -SHA256(Wireshark-4.2.8-arm64.exe)=16d744691a2ab96bb5592f14cadde49c7f15cfe14f45ae3f05d8e38848db9ca2 -SHA1(Wireshark-4.2.8-arm64.exe)=a3570702556a0f5a0682a5fbbe787689f22ae86d - -Wireshark-4.2.8-x64.msi: 63180800 bytes -SHA256(Wireshark-4.2.8-x64.msi)=ac32494747c2bb1e21bd50818a5a00e0d2e176a1f4d0bb02197df1c4692d803f -SHA1(Wireshark-4.2.8-x64.msi)=c16bf2167732dbecc077ea72065432a1be28a545 - -WiresharkPortable64_4.2.8.paf.exe: 53685280 bytes -SHA256(WiresharkPortable64_4.2.8.paf.exe)=9381c1e1cdcc6905b0a999b0c564eac6d457076ec003312a01aac25caecc3c91 -SHA1(WiresharkPortable64_4.2.8.paf.exe)=45b770ca2ac6779de9f8f1d2a4acf5f335dbefb8 - -Wireshark 4.2.8 Arm 64.dmg: 65597846 bytes -SHA256(Wireshark 4.2.8 Arm 64.dmg)=edb85a42b29dd10bf83b17af92c72829c12bcf75ed576d1aaed0c232fa9c7d41 -SHA1(Wireshark 4.2.8 Arm 64.dmg)=7d17e15ecd384750c4c1560a27a7aabaa78411d0 - -Wireshark 4.2.8 Intel 64.dmg: 69373277 bytes -SHA256(Wireshark 4.2.8 Intel 64.dmg)=0a1bab7e7761d23ba6d2ee0b52dc3bb6fc656be1d145b0463e34098f101a1f1c -SHA1(Wireshark 4.2.8 Intel 64.dmg)=416e62f8153c675ba152b5a07a89c73120919099 - -You can validate these hashes using the following commands (among others): - - Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 - Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz - macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" - Other: openssl sha256 wireshark-x.y.z.tar.xz ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmcG5c4ACgkQgiRKeOb+ -ruoaww//VRrjQaslecCPWsVQSV11Lnyn5bBbV1kdiJ69EETpHHYu6BlyyAbtoAF2 -47D7iQclZzN0WnoG3s2DXzNr0svJbjaprrm/38wRbeKEC07inQLm1tQw1QPqAQPS -lhnCwCCkG9gp0T/GWUFfUaDlpxmRItNnuFGPIAN/3ybK+fTEvfrOwEhohVbEvQqm -ksN9O7qggtU7zVXjQkrKrHhsmmao4yEaXTfSiP6pssOWGiu8MRImduRYWL3N5nhN -KcHEERMI5yzQJ5i9uuPzZ95vrrG17c0pqxEYJJoJ7zQ2Cv6USWON6bZYoa+ZspX3 -sg/wZOUjsp+ZjBuQLktAEB4tM1iCmxwye8ollaCx9EsbqUlDgdJ/i6PplvhFh7wd -CvW37u4cT+n89lWdJAcI5ApERSpINXqntC7ufhCuudNjQ9qaFtRGD46f7sKVZv0w -TseUq0gyLjqklmyuw9nru8griOXDJjy9rXAHLLrm/PfE/z6+7w8IcdCjr1Dj8Oss -nRhPmgD7E2vJumM63kWBPEqyb47fwQE5mwju/XJD1n0tgkzLEiwcJADfohrx2+HD -J2GlGcbqTMdZuOMnS+z2btxjo4KEowKw8pkABEQMCtbXJ9PwigC5Qj6LCE7kRwH9 -pbPYjh3vcu/Z8xglfl+dbg57BQ2PFthD+GAtIGP7qLjZFcbtv+0= -=bINv ------END PGP SIGNATURE----- diff --git a/SIGNATURES-4.4.2.txt b/SIGNATURES-4.4.2.txt new file mode 100644 index 0000000000000000000000000000000000000000..ed2c464a8eb5c799c2dd8ae4177619645ba00a69 --- /dev/null +++ b/SIGNATURES-4.4.2.txt @@ -0,0 +1,53 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-4.4.2.tar.xz: 46763620 bytes +SHA256(wireshark-4.4.2.tar.xz)=6053d97499c83feb87ce1d7f732d9c889c6c18bb334de67e65dca11483b0514e +SHA1(wireshark-4.4.2.tar.xz)=95e8dbc57e19c52ec8b41a06e49cfd70298d0037 + +Wireshark-4.4.2-x64.exe: 87277648 bytes +SHA256(Wireshark-4.4.2-x64.exe)=69a7f6e94e3744422efbb83528d42dd3ee19c12e253db040c33b75453152dce2 +SHA1(Wireshark-4.4.2-x64.exe)=20a4304ff7153e38f07121a76a59f442b369cd42 + +Wireshark-4.4.2-arm64.exe: 68735248 bytes +SHA256(Wireshark-4.4.2-arm64.exe)=51965e0739799fe927a56befdbad5700e290130a2cb21afb87a9796a6b5c5c64 +SHA1(Wireshark-4.4.2-arm64.exe)=ab37419e4918afabb1acea36b600f72a77ae5f02 + +Wireshark-4.4.2-x64.msi: 63852544 bytes +SHA256(Wireshark-4.4.2-x64.msi)=66406c4010f72d8623aa7a50e53acb1bef92919be5bf981840cffd3607d67014 +SHA1(Wireshark-4.4.2-x64.msi)=8ff9b813b7f93974dc963b52a251186e020195c1 + +WiresharkPortable64_4.4.2.paf.exe: 72787488 bytes +SHA256(WiresharkPortable64_4.4.2.paf.exe)=937de59eb2ca8d9ec706e3b218f780ca6f3e9a209cb32a34e4557e381a17c895 +SHA1(WiresharkPortable64_4.4.2.paf.exe)=904a20c7d86bc9ab9b94a88f93996f9edc517d39 + +Wireshark 4.4.2 Arm 64.dmg: 65429981 bytes +SHA256(Wireshark 4.4.2 Arm 64.dmg)=e60c577e9e2ffff7b2fc10d50c27f41a061d3140ae3bc2a223dba882da00c428 +SHA1(Wireshark 4.4.2 Arm 64.dmg)=cde6dd2ed3eb60661caf05a2709c92d24d6744a5 + +Wireshark 4.4.2 Intel 64.dmg: 69155990 bytes +SHA256(Wireshark 4.4.2 Intel 64.dmg)=5f379065fa16424c68362346177b146b6050fcb77f2468b85cf197f09e399113 +SHA1(Wireshark 4.4.2 Intel 64.dmg)=74b1d1ba6b57a1c7dc9308641e97b7525b758abc + +You can validate these hashes using the following commands (among others): + + Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 + Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz + macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" + Other: openssl sha256 wireshark-x.y.z.tar.xz +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmc+N7IACgkQgiRKeOb+ +ruqpsA/9H6F3u9y24JzlTaIpTpagMzfeNy0Rlda/wObDOrHvQrLjw1ScTy41vNZN +L7Q0HPVQPKZVwU669vANrdEXECnyEaZfEsJcMho/kvasxV5pUaxPCxZdbJ+g7sx7 +iAyvvEfdVlT3Vz8xO2635s5wRGj4NTKYDBjr96J//K3SCU+iclUJfPnYvpHu+f5s +dZaLN6Gdv4R4T2w9X6w7tPgXxU9bs0PJmTguofDE5+nYQIh7oVchVf1ODWEgA+DC +Xf87ODz5Fw7PUP55Cx/j9m0lW85bke7ce4N6SBpj2pwTr0NPAF4OFHU/VADu0f/4 +h6IKZyGoM5EmlBbfD2CKwDL1YOQmUe4CstiXX2mruzDhpkuN7DKoLtHOPT44fBTx +JwGMUWpv+VaPRCcmj1ybyQNjgU1f3NW3MUcgRbRzNTyxXwfg8hgv+ZqqyP1BxIMW +nxxrHQI9KMs58LFUJK8w5xIpkLq1e4wYrCWiI5yYZFZtFbvYN5Ya1LPMPbQanCiC +ivXF2v36YPXA0s5miC4+tKw16QB6FyeOYdA4LBuYw8JCxZVYUPXgihyI8msxcBzh +6qWiimbZ2GdNGPCWGWoSL0223TfBdA1lRQePz6S/Ubsg5tz+n8yZZp4aufy68VlZ +bYzSbZXV770F2Ijo9cWPZoxGeHP2hrrQydht1GDvPCDU90r4H7g= +=aRFt +-----END PGP SIGNATURE----- diff --git a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch index b71f99c73c0612f1dc327ea9257bf9bfef73c62c..7e9cb39047217023c8aea0dc6201b9a9fb1b5ad1 100644 --- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch +++ b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch @@ -8,11 +8,11 @@ index 52c5017e1f..fb980269db 100644 --- a/plugins/epan/profinet/packet-dcom-cba.c +++ b/plugins/epan/profinet/packet-dcom-cba.c @@ -543,7 +543,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) + packet_info *pinfo, proto_tree *tree, dcerpc_info *di, uint8_t *drep) { - guint32 u32Pointer; -- gchar szStr[1000]; -+ gchar szStr[1000] = ""; - guint32 u32MaxStr = sizeof(szStr); - gchar *call; + uint32_t u32Pointer; +- char szStr[1000]; ++ char szStr[1000] = ""; + uint32_t u32MaxStr = sizeof(szStr); + char *call; diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index f7a163762e43e147d7ddc422e79dd1c26e69e530..a85628670c073ce845ef51e6a408b521a223c228 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -18,27 +18,6 @@ to use different directory on different filesystem. create mode 100644 wsutil/wstmpdir.c create mode 100644 wsutil/wstmpdir.h -diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp -index 752b669ac4..42c2be0fca 100644 ---- a/ui/qt/about_dialog.cpp -+++ b/ui/qt/about_dialog.cpp -@@ -14,6 +14,7 @@ - - #include "main_application.h" - #include -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -185,7 +186,7 @@ FolderListModel::FolderListModel(QObject * parent): - appendRow(QStringList() << tr("\"File\" dialogs") << get_open_dialog_initial_dir() << tr("capture files")); - - /* temp */ -- appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir()) << tr("untitled capture files")); -+ appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : get_tmp_dir()) << tr("untitled capture files")); - - /* pers conf */ - appendRow(QStringList() << tr("Personal configuration") diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index 07b9b42e01..fb09de989b 100644 --- a/ui/qt/iax2_analysis_dialog.cpp @@ -272,3 +251,24 @@ index 0000000000..07ac5837ac -- 2.37.3 +diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp +index ea11122..982ba1a 100644 +--- a/ui/qt/about_dialog.cpp ++++ b/ui/qt/about_dialog.cpp +@@ -14,6 +14,7 @@ + + #include "main_application.h" + #include ++#include /* for get_tmp_dir() */ + + #include + #include +@@ -204,7 +205,7 @@ FolderListModel::FolderListModel(QObject * parent): + appendRow(QStringList() << tr("\"File\" dialog location") << get_open_dialog_initial_dir() << tr("Capture files")); + + /* temp */ +- appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir()) ++ appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : get_tmp_dir()) + << tr("Untitled capture files")); + + /* pers conf */ diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch index 3ef90b0cac8e410aedc670cdc808c521f14b6a27..e32958af90be07c49dc9a15c99625b43d5176d39 100644 --- a/wireshark-0008-pkgconfig.patch +++ b/wireshark-0008-pkgconfig.patch @@ -1,13 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27fa752..7bdc036 100644 +index 17fa031..6876018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4037,9 +4037,6 @@ install( - "${CMAKE_BINARY_DIR}/wireshark.pc" - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig -- COMPONENT -- "Development" +@@ -4175,8 +4175,6 @@ endif() + + install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +- COMPONENT "Development" - EXCLUDE_FROM_ALL ) diff --git a/wireshark-4.2.8.tar.xz b/wireshark-4.4.2.tar.xz similarity index 77% rename from wireshark-4.2.8.tar.xz rename to wireshark-4.4.2.tar.xz index df4e132d0ddecea5ff6e44b798ae3dc345a9be0f..4ffa696dfd689334df017eff8251e497cc58a143 100644 Binary files a/wireshark-4.2.8.tar.xz and b/wireshark-4.4.2.tar.xz differ diff --git a/wireshark.spec b/wireshark.spec index 9ce7ee3e40a3552702db446514c5b8bea1bcdd72..bf8492bde1ee00041a0741408d6af86090808de8 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,10 +1,10 @@ %undefine __cmake_in_source_build -%global plugins_version 4.2 +%global plugins_version 4.4 Summary: Network traffic analyzer Name: wireshark -Version: 4.2.8 -Release: 3 +Version: 4.4.2 +Release: 1 Epoch: 1 License: BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib) Url: http://www.wireshark.org/ @@ -172,10 +172,21 @@ fi %{_libdir}/cmake/%{name} %files help -%doc AUTHORS INSTALL NEWS README* doc/README.* ChangeLog +%doc AUTHORS INSTALL README* doc/README.* ChangeLog %{_mandir}/man?/* %changelog +* Fri Nov 22 2024 yaoxin - 1:4.4.2-1 +- Update to 4.4.2 + * wnpa-sec-2024-14 FiveCo RAP dissector infinite loop. Issue 20176. (CVE-2024-11595) + * wnpa-sec-2024-15 ECMP dissector crash. Issue 20214. (CVE-2024-11596) + * CIP I/O is not detected by "enip" filter anymore. Issue 19517. + * Fuzz job issue: fuzz-2024-09-03-7550.pcap. Issue 20041. + * OSS-Fuzz 71476: wireshark:fuzzshark_ip_proto-udp: Index-out-of-bounds in DOFObjectID_Create_Unmarshal. Issue 20065. + * JA4_c hashes an empty field to e3b0c44298fc when it should be 000000000000. Issue 20066. +- Many more features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-4.4.2.html + * Tue Nov 05 2024 Funda Wang - 1:4.2.8-3 - adopt to cmake macro change