Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f10d275bf8 | ||
|
|
dec2f5ac65 | ||
|
|
85502706e3 | ||
|
|
17522bfc28 | ||
|
|
cdc66609f6 | ||
|
|
f28439e0c2 | ||
|
|
263e01e08f | ||
|
|
a8b7c7aadc | ||
|
|
0f87d3fa36 | ||
|
|
53fcbefb24 |
5 changed files with 290 additions and 4 deletions
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (wireshark-4.0.3.tar.xz) = ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
|
||||
SHA512 (SIGNATURES-4.0.3.txt) = ab8abcadb076635897aa5db75ccebf916796a90cd46fb0fe1713e2e44ed525d25b1152831e70996d728e690fc21e9eb6b0bdf7080111401377ed62774f650d41
|
||||
SHA512 (wireshark-4.0.13.tar.xz) = 3d07eb80411604a460be7f17841d85d7189c0fbee2e5d46c951550d20c561a329b47f77918d730fe1c749c69d153a166a84337fb138b5141983fc3ffb6cfcb1e
|
||||
SHA512 (SIGNATURES-4.0.13.txt) = e33b7ace205e5caab38cebabfde87d36d58322dcccbd8eb87a2abd7fbc27a24a6ca6c0036a163c8bb5e015a645249ee10af01868e14a5ac2c52e8adc7498db01
|
||||
|
|
|
|||
13
wireshark-0008-glib2-g_strdup-build.patch
Normal file
13
wireshark-0008-glib2-g_strdup-build.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp
|
||||
index 0594ff6..3068797 100644
|
||||
--- a/ui/qt/wireshark_main_window_slots.cpp
|
||||
+++ b/ui/qt/wireshark_main_window_slots.cpp
|
||||
@@ -2513,7 +2513,7 @@ void WiresharkMainWindow::showHideMainWidgets(QAction *action)
|
||||
if (widget == toolbar) {
|
||||
GList *entry = g_list_find_custom(recent.interface_toolbars, action->text().toUtf8(), (GCompareFunc)strcmp);
|
||||
if (show && !entry) {
|
||||
- recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8()));
|
||||
+ recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8().constData()));
|
||||
} else if (!show && entry) {
|
||||
recent.interface_toolbars = g_list_remove(recent.interface_toolbars, entry->data);
|
||||
}
|
||||
164
wireshark-0009-ripemd-fips-core-dump.patch
Normal file
164
wireshark-0009-ripemd-fips-core-dump.patch
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
diff --git a/capinfos.c b/capinfos.c
|
||||
index 3c7866befd..da576f88c5 100644
|
||||
--- a/capinfos.c
|
||||
+++ b/capinfos.c
|
||||
@@ -141,7 +141,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */
|
||||
|
||||
// Strongest to weakest
|
||||
#define HASH_SIZE_SHA256 32
|
||||
-#define HASH_SIZE_RMD160 20
|
||||
#define HASH_SIZE_SHA1 20
|
||||
|
||||
#define HASH_STR_SIZE (65) /* Max hash size * 2 + '\0' */
|
||||
@@ -743,7 +742,6 @@ print_stats(const gchar *filename, capture_info *cf_info)
|
||||
}
|
||||
if (cap_file_hashes) {
|
||||
printf ("SHA256: %s\n", file_sha256);
|
||||
- printf ("RIPEMD160: %s\n", file_rmd160);
|
||||
printf ("SHA1: %s\n", file_sha1);
|
||||
}
|
||||
if (cap_order) printf ("Strict time order: %s\n", order_string(cf_info->order));
|
||||
@@ -857,7 +855,6 @@ print_stats_table_header(void)
|
||||
if (cap_packet_rate) print_stats_table_header_label("Average packet rate (packets/sec)");
|
||||
if (cap_file_hashes) {
|
||||
print_stats_table_header_label("SHA256");
|
||||
- print_stats_table_header_label("RIPEMD160");
|
||||
print_stats_table_header_label("SHA1");
|
||||
}
|
||||
if (cap_order) print_stats_table_header_label("Strict time order");
|
||||
@@ -1182,7 +1179,6 @@ calculate_hashes(const char *filename)
|
||||
}
|
||||
gcry_md_final(hd);
|
||||
hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, file_sha256);
|
||||
- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, file_rmd160);
|
||||
hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, file_sha1);
|
||||
}
|
||||
if (fh) fclose(fh);
|
||||
@@ -1489,7 +1485,7 @@ print_usage(FILE *output)
|
||||
fprintf(output, " -E display the capture file encapsulation\n");
|
||||
fprintf(output, " -I display the capture file interface information\n");
|
||||
fprintf(output, " -F display additional capture file information\n");
|
||||
- fprintf(output, " -H display the SHA256, RIPEMD160, and SHA1 hashes of the file\n");
|
||||
+ fprintf(output, " -H display the SHA256 and SHA1 hashes of the file\n");
|
||||
fprintf(output, " -k display the capture comment\n");
|
||||
fprintf(output, "\n");
|
||||
fprintf(output, "Size infos:\n");
|
||||
@@ -1842,10 +1838,9 @@ main(int argc, char *argv[])
|
||||
if (cap_file_hashes) {
|
||||
gcry_check_version(NULL);
|
||||
gcry_md_open(&hd, GCRY_MD_SHA256, 0);
|
||||
- if (hd) {
|
||||
- gcry_md_enable(hd, GCRY_MD_RMD160);
|
||||
+ if (hd)
|
||||
gcry_md_enable(hd, GCRY_MD_SHA1);
|
||||
- }
|
||||
+
|
||||
hash_buf = (char *)g_malloc(HASH_BUF_SIZE);
|
||||
}
|
||||
|
||||
diff --git a/doc/capinfos.adoc b/doc/capinfos.adoc
|
||||
index 16ed2e300a..124fb56694 100644
|
||||
--- a/doc/capinfos.adoc
|
||||
+++ b/doc/capinfos.adoc
|
||||
@@ -200,7 +200,7 @@ Prints the help listing and exits.
|
||||
-H::
|
||||
+
|
||||
--
|
||||
-Displays the SHA256, RIPEMD160, and SHA1 hashes for the file.
|
||||
+Displays the SHA256 and SHA1 hashes for the file.
|
||||
SHA1 output may be removed in the future.
|
||||
--
|
||||
|
||||
diff --git a/capinfos.c b/capinfos.c
|
||||
index f0059f4e54..e153097219 100644
|
||||
--- a/capinfos.c
|
||||
+++ b/capinfos.c
|
||||
@@ -148,7 +148,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */
|
||||
|
||||
|
||||
static gchar file_sha256[HASH_STR_SIZE];
|
||||
-static gchar file_rmd160[HASH_STR_SIZE];
|
||||
static gchar file_sha1[HASH_STR_SIZE];
|
||||
|
||||
static char *hash_buf = NULL;
|
||||
@@ -1024,11 +1023,6 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
|
||||
printf("%s", file_sha256);
|
||||
putquote();
|
||||
|
||||
- putsep();
|
||||
- putquote();
|
||||
- printf("%s", file_rmd160);
|
||||
- putquote();
|
||||
-
|
||||
putsep();
|
||||
putquote();
|
||||
printf("%s", file_sha1);
|
||||
@@ -1168,7 +1162,6 @@ calculate_hashes(const char *filename)
|
||||
size_t hash_bytes;
|
||||
|
||||
(void) g_strlcpy(file_sha256, "<unknown>", HASH_STR_SIZE);
|
||||
- (void) g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE);
|
||||
(void) g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE);
|
||||
|
||||
if (cap_file_hashes) {
|
||||
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
|
||||
index 9e5b86a7fd..c77056818c 100644
|
||||
--- a/ui/qt/capture_file_properties_dialog.cpp
|
||||
+++ b/ui/qt/capture_file_properties_dialog.cpp
|
||||
@@ -175,11 +175,6 @@ QString CaptureFilePropertiesDialog::summaryToHtml()
|
||||
<< table_data_tmpl.arg(summary.file_sha256)
|
||||
<< table_row_end;
|
||||
|
||||
- out << table_row_begin
|
||||
- << table_vheader_tmpl.arg(tr("Hash (RIPEMD160)"))
|
||||
- << table_data_tmpl.arg(summary.file_rmd160)
|
||||
- << table_row_end;
|
||||
-
|
||||
out << table_row_begin
|
||||
<< table_vheader_tmpl.arg(tr("Hash (SHA1)"))
|
||||
<< table_data_tmpl.arg(summary.file_sha1)
|
||||
diff --git a/ui/summary.c b/ui/summary.c
|
||||
index 127698fd5c..58c7cd68a4 100644
|
||||
--- a/ui/summary.c
|
||||
+++ b/ui/summary.c
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
// Strongest to weakest
|
||||
#define HASH_SIZE_SHA256 32
|
||||
-#define HASH_SIZE_RMD160 20
|
||||
#define HASH_SIZE_SHA1 20
|
||||
|
||||
#define HASH_BUF_SIZE (1024 * 1024)
|
||||
@@ -213,12 +212,10 @@ summary_fill_in(capture_file *cf, summary_tally *st)
|
||||
g_free(idb_info);
|
||||
|
||||
(void) g_strlcpy(st->file_sha256, "<unknown>", HASH_STR_SIZE);
|
||||
- (void) g_strlcpy(st->file_rmd160, "<unknown>", HASH_STR_SIZE);
|
||||
(void) g_strlcpy(st->file_sha1, "<unknown>", HASH_STR_SIZE);
|
||||
|
||||
gcry_md_open(&hd, GCRY_MD_SHA256, 0);
|
||||
if (hd) {
|
||||
- gcry_md_enable(hd, GCRY_MD_RMD160);
|
||||
gcry_md_enable(hd, GCRY_MD_SHA1);
|
||||
}
|
||||
hash_buf = (char *)g_malloc(HASH_BUF_SIZE);
|
||||
@@ -230,7 +227,6 @@ summary_fill_in(capture_file *cf, summary_tally *st)
|
||||
}
|
||||
gcry_md_final(hd);
|
||||
hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, st->file_sha256);
|
||||
- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, st->file_rmd160);
|
||||
hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, st->file_sha1);
|
||||
}
|
||||
if (fh) fclose(fh);
|
||||
diff --git a/ui/summary.h b/ui/summary.h
|
||||
index 9063b99b77..95a51a38c0 100644
|
||||
--- a/ui/summary.h
|
||||
+++ b/ui/summary.h
|
||||
@@ -56,7 +56,6 @@ typedef struct _summary_tally {
|
||||
const char *filename; /**< path of capture file */
|
||||
gint64 file_length; /**< file length in bytes */
|
||||
gchar file_sha256[HASH_STR_SIZE]; /**< SHA256 hash of capture file */
|
||||
- gchar file_rmd160[HASH_STR_SIZE]; /**< RIPEMD160 hash of capture file */
|
||||
gchar file_sha1[HASH_STR_SIZE]; /**< SHA1 hash of capture file */
|
||||
int file_type; /**< wiretap file type */
|
||||
wtap_compression_type compression_type; /**< compression type of file, or uncompressed */
|
||||
74
wireshark-0010-manage-interfaces-crash.patch
Normal file
74
wireshark-0010-manage-interfaces-crash.patch
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
From 2d55e5672b07a8a102024e0af66e821bba51213b Mon Sep 17 00:00:00 2001
|
||||
From: Gerald Combs <gerald@wireshark.org>
|
||||
Date: Sun, 27 Aug 2023 14:47:52 -0700
|
||||
Subject: [PATCH] Qt: Fix ManageInterfacesDialog cleanup
|
||||
|
||||
Handle our ManageInterfacesDialog cleanup tasks inside our destructor.
|
||||
If we try to handle them in on_buttonBox_accepted we run into a race
|
||||
condition with WA_DeleteOnClose.
|
||||
|
||||
Fixes #19287
|
||||
---
|
||||
ui/qt/manage_interfaces_dialog.cpp | 25 ++++++++++++-------------
|
||||
ui/qt/manage_interfaces_dialog.h | 2 --
|
||||
2 files changed, 12 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
|
||||
index cb9da8697b5..a8529e265a9 100644
|
||||
--- a/ui/qt/manage_interfaces_dialog.cpp
|
||||
+++ b/ui/qt/manage_interfaces_dialog.cpp
|
||||
@@ -209,6 +209,18 @@ ManageInterfacesDialog::ManageInterfacesDialog(QWidget *parent) :
|
||||
|
||||
ManageInterfacesDialog::~ManageInterfacesDialog()
|
||||
{
|
||||
+ if (result() == QDialog::Accepted) {
|
||||
+#ifdef HAVE_LIBPCAP
|
||||
+ sourceModel->save();
|
||||
+#endif
|
||||
+#ifdef HAVE_PCAP_REMOTE
|
||||
+ remoteAccepted();
|
||||
+#endif
|
||||
+ prefs_main_write();
|
||||
+ mainApp->refreshLocalInterfaces();
|
||||
+ emit ifsChanged();
|
||||
+ }
|
||||
+
|
||||
delete ui;
|
||||
}
|
||||
|
||||
@@ -252,19 +264,6 @@ void ManageInterfacesDialog::updateWidgets()
|
||||
ui->hintLabel->setText(hint);
|
||||
}
|
||||
|
||||
-void ManageInterfacesDialog::on_buttonBox_accepted()
|
||||
-{
|
||||
-#ifdef HAVE_LIBPCAP
|
||||
- sourceModel->save();
|
||||
-#endif
|
||||
-#ifdef HAVE_PCAP_REMOTE
|
||||
- remoteAccepted();
|
||||
-#endif
|
||||
- prefs_main_write();
|
||||
- mainApp->refreshLocalInterfaces();
|
||||
- emit ifsChanged();
|
||||
-}
|
||||
-
|
||||
#ifdef HAVE_LIBPCAP
|
||||
void ManageInterfacesDialog::on_addPipe_clicked()
|
||||
{
|
||||
diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
|
||||
index 80b78afbe7a..79e9d0d9bfa 100644
|
||||
--- a/ui/qt/manage_interfaces_dialog.h
|
||||
+++ b/ui/qt/manage_interfaces_dialog.h
|
||||
@@ -59,8 +59,6 @@ signals:
|
||||
private slots:
|
||||
void updateWidgets();
|
||||
|
||||
- void on_buttonBox_accepted();
|
||||
-
|
||||
#ifdef HAVE_LIBPCAP
|
||||
void on_addPipe_clicked();
|
||||
void on_delPipe_clicked();
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 4.0.3
|
||||
Version: 4.0.13
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
License: GPL+
|
||||
|
|
@ -27,6 +27,9 @@ Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
|
|||
# Fedora-specific
|
||||
Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch
|
||||
Patch7: wireshark-0007-cmakelists.patch
|
||||
Patch8: wireshark-0008-glib2-g_strdup-build.patch
|
||||
Patch9: wireshark-0009-ripemd-fips-core-dump.patch
|
||||
Patch10: wireshark-0010-manage-interfaces-crash.patch
|
||||
|
||||
#install tshark together with wireshark GUI
|
||||
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -106,7 +109,10 @@ Wireshark.
|
|||
|
||||
%package devel
|
||||
Summary: Development headers and libraries for wireshark
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
|
||||
Requires: glibc-devel
|
||||
Requires: glib2-devel
|
||||
|
||||
%description devel
|
||||
The wireshark-devel package contains the header files, developer
|
||||
|
|
@ -275,6 +281,35 @@ fi
|
|||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
* Tue Mar 05 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.0.13-1
|
||||
- New version 4.0.13
|
||||
|
||||
* Thu Feb 01 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.0.12-1
|
||||
- New version 4.0.12
|
||||
|
||||
* Thu Aug 31 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.8-2
|
||||
- Resolves: #2236246 - wireshark crash in managed interfaces
|
||||
|
||||
* Tue Aug 29 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.8-1
|
||||
- New version 4.0.8
|
||||
- Resolves: #2235577 - possible Denial of Service via crafted package
|
||||
|
||||
* Fri Jul 28 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.7-2
|
||||
- Resolves: #2227004 - capinfos aborts in FIPS
|
||||
|
||||
* Fri Jul 14 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.7-1
|
||||
- New version 4.0.7
|
||||
|
||||
* Thu May 25 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.6-1
|
||||
- New version 4.0.6
|
||||
|
||||
* Thu Apr 13 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.5-1
|
||||
- New version 4.0.5
|
||||
- Fix for bug #2159392
|
||||
|
||||
* Tue Mar 07 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.4-1
|
||||
- New version 4.0.4
|
||||
|
||||
* Thu Feb 02 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.3-1
|
||||
- New version 4.0.3
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue