diff --git a/CVE-2025-9817.patch b/CVE-2025-9817.patch deleted file mode 100644 index 7e55990f9366c76d4cbcefd25983ad8fd7c5ce3f..0000000000000000000000000000000000000000 --- a/CVE-2025-9817.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d3db4696f7286b669a04ebfa49a0c5811a1da63f Mon Sep 17 00:00:00 2001 -From: John Thacker -Date: Sat, 26 Jul 2025 11:48:36 +0000 -Subject: [PATCH] ssh: Add a null check - -Fix #20642 - - -(cherry picked from commit 39daba5e247ea495f88b0be82f0b7ebbdbf50fba) - -Co-authored-by: John Thacker - -Origin: https://gitlab.com/wireshark/wireshark/-/commit/d3db4696f7286b669a04ebfa49a0c5811a1da63f ---- - epan/dissectors/packet-ssh.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c -index 11c6b597f2b..be0b8e71c9d 100644 ---- a/epan/dissectors/packet-ssh.c -+++ b/epan/dissectors/packet-ssh.c -@@ -2456,6 +2456,10 @@ ssh_kex_shared_secret(int kex_type, ssh_bignum *pub, ssh_bignum *priv, ssh_bignu - } - - if(kex_type==SSH_KEX_DH_GEX){ -+ if (modulo == NULL) { -+ ws_debug("Missing group modulo"); -+ return NULL; -+ } - gcry_mpi_t b = NULL; - gcry_mpi_scan(&b, GCRYMPI_FMT_USG, pub->data, pub->length, NULL); - gcry_mpi_t d = NULL, e = NULL, m = NULL; --- -GitLab - diff --git a/wireshark-4.4.7.tar.xz b/wireshark-4.4.10.tar.xz similarity index 32% rename from wireshark-4.4.7.tar.xz rename to wireshark-4.4.10.tar.xz index 2181b82532d924925da7d1711274c9feaf229bb5..3d892530aa112a8f7ec38dc08b011e5554e34785 100644 --- a/wireshark-4.4.7.tar.xz +++ b/wireshark-4.4.10.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5644143fed6363fa6c0cf58c2a6fe9ba0922efaea8f981c7228260bf46f1494b -size 46812644 +oid sha256:47f50294dc309a01404b07ce68e45abc8a5836aa665eef4ffde32a01e5867988 +size 46842436 diff --git a/wireshark.spec b/wireshark.spec index 0036ff9705ada7f9f12074bf2f95a3a94681beaf..4e8c21228b33d038a9f73398c996b7261c56e1fc 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -2,8 +2,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.7 -Release: 3 +Version: 4.4.10 +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: https://www.wireshark.org/ @@ -19,7 +19,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-2025-9817.patch Requires: xdg-utils Requires: hicolor-icon-theme @@ -200,6 +199,9 @@ fi %{_mandir}/man?/* %changelog +* Sat Oct 11 2025 yaoxin <1024769339@qq.com> - 1:4.4.10-1 +- Update to 4.4.10 for fix CVE-2025-11626 + * Wed Sep 03 2025 yaoxin <1024769339@qq.com> - 1:4.4.7-3 - Fix CVE-2025-9817