diff --git a/CVE-2024-8250.patch b/CVE-2024-8250.patch deleted file mode 100644 index 4791221734d995f0808d360f3d74e2bc3be43bb4..0000000000000000000000000000000000000000 --- a/CVE-2024-8250.patch +++ /dev/null @@ -1,56 +0,0 @@ -From be0e7c955d7efa628baa97447127c3434b575765 Mon Sep 17 00:00:00 2001 -From: John Thacker -Date: Sun, 28 Jul 2024 13:06:50 +0000 -Subject: [PATCH] ntlmssp: Don't insert a key created on the stack into a hash - table - -Origin: https://gitlab.com/wireshark/wireshark/-/merge_requests/16640 - -We could change this table to an autoreset wmem_map as well. - -Fix #19943 - - -(cherry picked from commit 66dcd56f1eae615697b6588ac4778a61a5576391) - -Co-authored-by: John Thacker ---- - epan/dissectors/packet-ntlmssp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c -index a538c204e61..d279d74eb53 100644 ---- a/epan/dissectors/packet-ntlmssp.c -+++ b/epan/dissectors/packet-ntlmssp.c -@@ -2353,7 +2353,9 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, - decrypted_payloads = g_slist_prepend(decrypted_payloads, - packet_ntlmssp_info->decrypted_payload); - if (key != NULL) { -- g_hash_table_insert(hash_packet, key, packet_ntlmssp_info); -+ uint8_t *perm_key = g_new(uint8_t, NTLMSSP_KEY_LEN); -+ memcpy(perm_key, key, NTLMSSP_KEY_LEN); -+ g_hash_table_insert(hash_packet, perm_key, packet_ntlmssp_info); - } - - /* Do the decryption of the payload */ -@@ -2803,7 +2805,7 @@ header_hash(gconstpointer pointer) - static gboolean - header_equal(gconstpointer pointer1, gconstpointer pointer2) - { -- if (!memcmp(pointer1, pointer2, 16)) { -+ if (!memcmp(pointer1, pointer2, NTLMSSP_KEY_LEN)) { - return TRUE; - } - else { -@@ -2814,7 +2816,7 @@ header_equal(gconstpointer pointer1, gconstpointer pointer2) - static void - ntlmssp_init_protocol(void) - { -- hash_packet = g_hash_table_new(header_hash, header_equal); -+ hash_packet = g_hash_table_new_full(header_hash, header_equal, g_free, NULL); - } - - static void --- -GitLab - diff --git a/SIGNATURES-4.2.5.txt b/SIGNATURES-4.2.5.txt deleted file mode 100644 index 54b7ca5c958eb6818ddf5a506b80da6c86e4e7b8..0000000000000000000000000000000000000000 --- a/SIGNATURES-4.2.5.txt +++ /dev/null @@ -1,53 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-4.2.5.tar.xz: 45014156 bytes -SHA256(wireshark-4.2.5.tar.xz)=55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f -SHA1(wireshark-4.2.5.tar.xz)=03293699260d2492166ac805ef0c10b8a6b531e6 - -Wireshark-4.2.5-x64.exe: 86489296 bytes -SHA256(Wireshark-4.2.5-x64.exe)=3d921ee584d0984f694f60a771a6581a6f32a9de995a5cd4bca1931185a4e618 -SHA1(Wireshark-4.2.5-x64.exe)=0e3c7b4dcd5c247c8f9726195a4d5a70b99f8b1b - -Wireshark-4.2.5-arm64.exe: 67980200 bytes -SHA256(Wireshark-4.2.5-arm64.exe)=331a0925ee1e4d6d1b16af6982972631335fc238afe626903ed122e146830c5a -SHA1(Wireshark-4.2.5-arm64.exe)=e0b5789980c0f12e344f6b8820f49facd5b379c6 - -Wireshark-4.2.5-x64.msi: 62894080 bytes -SHA256(Wireshark-4.2.5-x64.msi)=65413e0733192979e168f8a11940828d1c2410ae21862f2e7012a3edb7e22ee1 -SHA1(Wireshark-4.2.5-x64.msi)=e925d3cee2e604ab659e4da42df0880a6531151f - -WiresharkPortable64_4.2.5.paf.exe: 53647808 bytes -SHA256(WiresharkPortable64_4.2.5.paf.exe)=1706e3c2d5e198270707641bbbde3042d8921cb95d2683633dd855fee921847d -SHA1(WiresharkPortable64_4.2.5.paf.exe)=ef0c034a38d77ead057dbb6444cce70f9a07815c - -Wireshark 4.2.5 Arm 64.dmg: 65573656 bytes -SHA256(Wireshark 4.2.5 Arm 64.dmg)=72d670ad068ac46c1d16ffb5fc8e6b582136a0eed6fc278b9f36877311e4e4af -SHA1(Wireshark 4.2.5 Arm 64.dmg)=84fe8ed0cf40b861f8039d811a1bb1704f9e57db - -Wireshark 4.2.5 Intel 64.dmg: 69328176 bytes -SHA256(Wireshark 4.2.5 Intel 64.dmg)=67a1ea88226c2f5699c3c6c36fb0006d84c62bdbfe5474dccff30860fd9f81b7 -SHA1(Wireshark 4.2.5 Intel 64.dmg)=a72a8034474e42c4e20a0f05e464ddb1f3616c66 - -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+ruoFAmZFCq4ACgkQgiRKeOb+ -ruoxyQ/+PWOKU9/4HVVhI+fKlfUfuzH5F8ABE+aH4wasbh6Yzw8rYy3d/bvpXimc -Cc3YKGNoQ/7ErwIvE2dF+fCaIo95mSDtQcrGn/gznSExGLXAPoBzfpchGm2qmqV9 -/qVKLPo9SR0ucwY054XyDcncIa2g2iXi9x2T5fsbLdNWoUZAkj5rk3bq0scQA1Pa -yt/F6M+alQpA2sUS2Lebq/1UVZtfGRbEP8ustmN7FeqlTZNfZezaFK2h0uVekJ0e -DqQJWh9Tvb/UIVusWh509HwfcuS8aQU5bJ/fN4JS5aNp41Aup5guiAIs+c96TPuy -EfrkHilFwvZsHJDsA+wH1Mq317Xjh/RiheDjUh/Gn1f9bubL6nkU2f3AOon3fAtX -xpRjNymEhvwiZYNTRv3PaGo21lsS4Oxggt/eZhmy0tntnB/fq3Ylrogn6SbOm0p7 -wuRfhl09Pb6m2Ol0pfkxck7OEiLn28RTqJmYwAiood0TMD8X6HNnNITqhPQq5ihb -96MNRfna6ES8mAmjFdiMSsUX+9jZYSDogQ/jxz1n+fcYLXXOMnPEYsyPt+xSMp6o -7CjIikcjTZ1cCKAuienirJWBt58PSjsewpVMVyDVkNeNniLtS+QB6Q2uW6W2UcHj -KhqMLvrX18YuTgdO/ZrxN33+H4nqyq07uS2n/E+cMAaAD2qVOKc= -=pOkW ------END PGP SIGNATURE----- diff --git a/SIGNATURES-4.2.7.txt b/SIGNATURES-4.2.7.txt new file mode 100644 index 0000000000000000000000000000000000000000..4616419b2894bed173597e6cf7437df4e662c609 --- /dev/null +++ b/SIGNATURES-4.2.7.txt @@ -0,0 +1,53 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-4.2.7.tar.xz: 45017312 bytes +SHA256(wireshark-4.2.7.tar.xz)=2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86 +SHA1(wireshark-4.2.7.tar.xz)=90624e262733bcb111081927d1e60a35301251b9 + +Wireshark-4.2.7-x64.exe: 86501096 bytes +SHA256(Wireshark-4.2.7-x64.exe)=a85375070cba58c1c53c051e85643651ea37840022eb13358c54bbc6fb83193f +SHA1(Wireshark-4.2.7-x64.exe)=e9d7ce19a037421008449a372e47b18219ca196e + +Wireshark-4.2.7-arm64.exe: 67998504 bytes +SHA256(Wireshark-4.2.7-arm64.exe)=19773c593b6a1bda9921c57407f96f85a19ad0c83a1e40541982b1e61b81e49c +SHA1(Wireshark-4.2.7-arm64.exe)=54dbb2a22348148140cbe421bf52fb88ee35f2dc + +Wireshark-4.2.7-x64.msi: 63148032 bytes +SHA256(Wireshark-4.2.7-x64.msi)=5afa8e3a146c70a62e9922e7c7136ff6274baa8a145a823521fa1fcdb01779fb +SHA1(Wireshark-4.2.7-x64.msi)=353e8fa795a365dbae4d4a9d47e89d20e7f64a02 + +WiresharkPortable64_4.2.7.paf.exe: 53663376 bytes +SHA256(WiresharkPortable64_4.2.7.paf.exe)=9955764524973f2d35b80b2904c3413e391d40ddfdbb42e47a45ef1fa49241eb +SHA1(WiresharkPortable64_4.2.7.paf.exe)=5be19351f0c15edcc1c8f2875dcde53dd653c254 + +Wireshark 4.2.7 Arm 64.dmg: 65582345 bytes +SHA256(Wireshark 4.2.7 Arm 64.dmg)=3853a900941df1d13be64ff2bebc47da5ffe81328650f7ab7546011792aa1c29 +SHA1(Wireshark 4.2.7 Arm 64.dmg)=f7e31c4a0f199ef82dd9f3ddababe97794d12b36 + +Wireshark 4.2.7 Intel 64.dmg: 69349139 bytes +SHA256(Wireshark 4.2.7 Intel 64.dmg)=21d1bb5fa3e79328c5790de1374a81ca1975d11d2d695cd90469e8032b729844 +SHA1(Wireshark 4.2.7 Intel 64.dmg)=a1d8c9025fccf4d8837fd05314613b4517003690 + +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+ruoFAmbPm2MACgkQgiRKeOb+ +ruo/LRAAjgOV5ZhbWPA8HwTYsGXfWOKCkne7/l3IM+PQRdN/iBDg/jW1CLqbTyk/ +zGgxcpYdyh8m2iBqDrWpFv2TZXRNUjcUrxcjyW2JXUXdqu/XCegHVgcr9pL4r61x +QwTbe68kofUy+cgqrRp/dPqLaNmxRZyGeig6dOnc/y+O9XwAShEUuwkMwhpK526r +j1Hs4GdvTciOTVM0178VSlHV9ORfzxEBOKCu3KNYMEbBHUy57LideUWJK3wnhcG/ +nQZnewCZ3cz4Pz0UjcOU21yLWqY3aXWJQ9VMWf8fo/T/q7/2B7Pu2wAcZQW4vZvf +0jzIeVpTG0aaEELenESXvQDG8V2mVulfDqT3v0iJ7MeaT/mTe8uTp05W0BERpRKf +s3SCR/yBDgzNCCW2rHFPuJlYzpLxMzZkp1mAD+DdtDH5wWLgOJcjyCAg1JryXR3e +Duv4/CCyvDDLMhvwZB2x8VaOrUzV76nax3ygd/tHulO5S+irDFopXTjuqFhvaUI9 +q1kDdpg7ZjEuja4NkPyS1Oe08+OUnQaBa4UYRo9fju+eCv6usKZvIpPbkD3jWWNt +C0lnY/LX3QmUU2aBPbNoX0eutTxKQ0x0tVsDG6XDUtXpfxoHFL0rKw63mFBdfPpH +Rmilpi9MR5H5xNL58HMAisjC+5p9xIEyFyAbW+HDSutSRJAYICI= +=2g4W +-----END PGP SIGNATURE----- diff --git a/wireshark-4.2.5.tar.xz b/wireshark-4.2.7.tar.xz similarity index 79% rename from wireshark-4.2.5.tar.xz rename to wireshark-4.2.7.tar.xz index e9fda2c202b709f952ea98abd81eba322ed1578b..d3738b5143d16c786aa69c5f831b2aff69b886ca 100644 Binary files a/wireshark-4.2.5.tar.xz and b/wireshark-4.2.7.tar.xz differ diff --git a/wireshark.spec b/wireshark.spec index 5a2e8d5e5be0059f58d899b4aad6567cd900023b..7cc3e1845c3c6c02bea2a3d25be2b583d44c87b7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,8 +4,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.2.5 -Release: 2 +Version: 4.2.7 +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/ @@ -22,7 +22,6 @@ Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch Patch7: wireshark-0007-cmakelists.patch Patch8: wireshark-0008-pkgconfig.patch -Patch9: CVE-2024-8250.patch Requires: xdg-utils Requires: hicolor-icon-theme @@ -203,6 +202,11 @@ fi %{_mandir}/man?/* %changelog +* Fri Sep 13 2024 yaoxin - 1:4.2.7-1 +- Update to 4.2.7: + * CVE-2024-8250: NTLMSSP dissector crash (boo#1229907). + * CVE-2024-8645: SPRT dissector crash. + * Fri Aug 30 2024 wangkai <13474090681@163.com> - 1:4.2.5-2 - Fix CVE-2024-8250