|
[-]
[+]
|
Changed |
wireshark.spec
|
|
|
|
[-]
[+]
|
Deleted |
wireshark-1.2.0-geoip.patch
^
|
| @@ -1,14 +0,0 @@
-Index: epan/geoip_db.c
-===================================================================
---- epan/geoip_db.c.orig
-+++ epan/geoip_db.c
-@@ -161,6 +161,9 @@ geoip_db_init(void) {
- geoip_dat_scan_dir(geoip_db_paths[i].path);
- }
- }
-+ if (num_geoip_db_paths < 1) {
-+ geoip_dat_scan_dir("/var/lib/GeoIP");
-+ }
-
- /* add fake databases for latitude and longitude (using "City" in reality) */
- {
|
|
[-]
[+]
|
Deleted |
wireshark-1.6.0-disable-warning-dialog.patch
^
|
| @@ -1,39 +0,0 @@
---- gtk/main.c.orig 2011-06-07 17:59:29.000000000 +0200
-+++ gtk/main.c 2011-06-12 19:54:26.414533419 +0200
-@@ -1380,13 +1380,13 @@
- }
-
- static GtkWidget *close_dlg = NULL;
--
-+/*
- static void
- priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
- {
- recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
- }
--
-+*/
- #ifdef _WIN32
- static void
- npf_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
-@@ -1966,9 +1966,10 @@
- #endif
- {
- gchar *cur_user, *cur_group;
-- gpointer priv_warning_dialog;
-+// gpointer priv_warning_dialog;
-
- /* Tell the user not to run as root. */
-+/*
- if (running_with_special_privs() && recent.privs_warn_if_elevated) {
- cur_user = get_cur_username();
- cur_group = get_cur_groupname();
-@@ -1980,7 +1981,7 @@
- simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
- simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
- }
--
-+*/
- #ifdef _WIN32
- /* Warn the user if npf.sys isn't loaded. */
- if (!stdin_capture && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) {
|
|
[-]
[+]
|
Deleted |
wireshark-1.6.3-desktop.patch
^
|
| @@ -1,14 +0,0 @@
---- wireshark.desktop.orig 2011-11-07 22:30:34.492031975 +0100
-+++ wireshark.desktop 2011-11-07 22:31:21.964161637 +0100
-@@ -68,9 +68,9 @@
- Comment[fi]=Verkkoliikenne analysaattori
- Comment[fr]=Analyseur de trafic réseau
- Comment[sv]=Nätverkstrafikanalysator
--Icon=wireshark.png
-+Icon=wireshark
- TryExec=wireshark
--Exec=wireshark %f
-+Exec=/usr/bin/xdg-su -c /usr/bin/wireshark %f
- Terminal=false
- MimeType=application/vnd.tcpdump.pcap;
- # Categorie entry according to version 1.0 of
|
|
[-]
[+]
|
Added |
wireshark-1.8.0-corosync-packet-dissector.patch
^
|
| @@ -0,0 +1,2773 @@
+Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
+===================================================================
+--- /dev/null
++++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
+@@ -0,0 +1,1274 @@
++/* packet-corosync-totemnet.c
++ * Routines for the lowest level(encryption/decryption) protocol used in Corosync cluster engine
++ * Copyright 2009 2010 Masatake YAMATO <yamato@redhat.com>
++ * Copyright (c) 2010 Red Hat, Inc.
++ *
++ * $Id:$
++ *
++ * Wireshark - Network traffic analyzer
++ * By Gerald Combs <gerald@wireshark.org>
++ * Copyright 1998 Gerald Combs
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <assert.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#include <glib.h>
++
++#include <epan/packet.h>
++#include <epan/prefs.h>
++#include <epan/crypt/crypt-sha1.h>
++
++#include "packet-corosync-totemsrp.h"
++
++/* This dissector deals packets defined in totemnet.c of corosync
++ cluster engine. In the totemnet.c the packet is encrypted and decrypted
++ with LibTomCrypt. This dissector tries decrypting the packet with
++ the library and sha1 functions in wireshark. */
++
++
++/* crypto.h */
++
++/* About LibTomCrypt:
++ * ---------------------------------------------------------------------
++ * LibTomCrypt, modular cryptographic library -- Tom St Denis
++ *
++ * LibTomCrypt is a library that provides various cryptographic
++ * algorithms in a highly modular and flexible manner.
++ *
++ * The library is free for all purposes without any express
++ * guarantee it works.
++ *
++ * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.com
++ */
++
++/*
++ * Modifications in packet-corosync-totemnet.c done by Masatake YAMATO
++ * ---------------------------------------------------------------------
++ *
++ * - added `corocrypto' as symbol prefix to some symbols, and
++ * - added `static' modifier to functions and symbols to narrow the scope.
++ *
++ */
++struct sober128_prng {
++ unsigned long R[17], /* Working storage for the shift register */
++ initR[17], /* saved register contents */
++ konst, /* key dependent constant */
++ sbuf; /* partial word encryption buffer */
++
++ int nbuf, /* number of part-word stream bits buffered */
++ flag, /* first add_entropy call or not? */
++ set; /* did we call add_entropy to set key? */
++
++};
++
++static int corocrypto_sober128_start(struct sober128_prng *prng);
++static int corocrypto_sober128_add_entropy(const unsigned char *buf, unsigned long len, struct sober128_prng *prng);
++static unsigned long corocrypto_sober128_read(unsigned char *buf, unsigned long len, struct sober128_prng *prng);
++
++
++/*
++ * Dissector body
++ */
++
++#define PORT_COROSYNC_TOTEMNET 5405
++
++/* Forward declaration we need below */
++void proto_reg_handoff_corosync_totemnet(void);
++
++/* Initialize the protocol and registered fields */
++static int proto_corosync_totemnet = -1;
++
++/* field of struct security_header */
++static int hf_corosync_totemnet_security_header_hash_digest = -1;
++static int hf_corosync_totemnet_security_header_salt = -1;
++
++/* configurable parameters */
++static guint corosync_totemnet_port = PORT_COROSYNC_TOTEMNET;
++static gchar* corosync_totemnet_private_key = NULL;
++
++/* Initialize the subtree pointers */
++static gint ett_corosync_totemnet_security_header = -1;
++
++
++#define HMAC_HASH_SIZE 20
++#define SALT_SIZE 16
++
++
++
++static int
++dissect_corosync_totemnet_security_header(tvbuff_t *tvb,
++ packet_info *pinfo, proto_tree *parent_tree)
++{
++ proto_item *item;
++ proto_tree *tree;
++
++
++ if (check_col(pinfo->cinfo, COL_PROTOCOL))
++ col_set_str(pinfo->cinfo, COL_PROTOCOL, "COROSYNC/TOTEMNET");
++
++ if (check_col(pinfo->cinfo, COL_INFO))
++ col_clear(pinfo->cinfo, COL_INFO);
++
++ if (parent_tree)
++ {
++ item = proto_tree_add_item(parent_tree, proto_corosync_totemnet, tvb, 0,
++ -1, FALSE);
++ tree = proto_item_add_subtree(item, ett_corosync_totemnet_security_header);
++
++ proto_tree_add_item(tree,
++ hf_corosync_totemnet_security_header_hash_digest,
++ tvb, 0, HMAC_HASH_SIZE, FALSE);
++ proto_tree_add_item(tree,
++ hf_corosync_totemnet_security_header_salt,
++ tvb, HMAC_HASH_SIZE, SALT_SIZE, FALSE);
++
++ }
++ return HMAC_HASH_SIZE + SALT_SIZE;
++}
++
++/* About totemnet.c of corosync cluster engine:
++ *
++ * dissect_corosynec_totemnet_with_decryption() is derived from
++ * totemnet.c in corosync.
++ *
++ * ---------------------------------------------------------------------
++ * Copyright (c) 2005 MontaVista Software, Inc.
++ * Copyright (c) 2006-2007 Red Hat, Inc.
++ * Copyright (c) 2006 Sun Microsystems, Inc.
++ *
++ * All rights reserved.
++ *
++ * Author: Steven Dake (sdake@redhat.com)
++
++ * This software licensed under BSD license, the text of which follows:
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ * this list of conditions and the following disclaimer in the documentation
++ * and/or other materials provided with the distribution.
++ * - Neither the name of the MontaVista Software, Inc. nor the names of its
++ * contributors may be used to endorse or promote products derived from this
++ * software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++static int
++dissect_corosynec_totemnet_with_decryption(tvbuff_t *tvb,
++ packet_info *pinfo, proto_tree *parent_tree)
++{
++ unsigned char keys[48];
|
|
[-]
[+]
|
Deleted |
wireshark-corosync-packet-dissector.patch
^
|
| @@ -1,2786 +0,0 @@
-Index: wireshark-1.4.0/epan/dissectors/Makefile.common
-===================================================================
---- wireshark-1.4.0.orig/epan/dissectors/Makefile.common
-+++ wireshark-1.4.0/epan/dissectors/Makefile.common
-@@ -307,6 +307,8 @@ DISSECTOR_SRC = \
- packet-collectd.c \
- packet-componentstatus.c \
- packet-cops.c \
-+ packet-corosync-totemnet.c \
-+ packet-corosync-totemsrp.c \
- packet-cosine.c \
- packet-cpfi.c \
- packet-cpha.c \
-Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
-===================================================================
---- /dev/null
-+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c
-@@ -0,0 +1,1274 @@
-+/* packet-corosync-totemnet.c
-+ * Routines for the lowest level(encryption/decryption) protocol used in Corosync cluster engine
-+ * Copyright 2009 2010 Masatake YAMATO <yamato@redhat.com>
-+ * Copyright (c) 2010 Red Hat, Inc.
-+ *
-+ * $Id:$
-+ *
-+ * Wireshark - Network traffic analyzer
-+ * By Gerald Combs <gerald@wireshark.org>
-+ * Copyright 1998 Gerald Combs
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include <assert.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <glib.h>
-+
-+#include <epan/packet.h>
-+#include <epan/prefs.h>
-+#include <epan/crypt/crypt-sha1.h>
-+
-+#include "packet-corosync-totemsrp.h"
-+
-+/* This dissector deals packets defined in totemnet.c of corosync
-+ cluster engine. In the totemnet.c the packet is encrypted and decrypted
-+ with LibTomCrypt. This dissector tries decrypting the packet with
-+ the library and sha1 functions in wireshark. */
-+
-+
-+/* crypto.h */
-+
-+/* About LibTomCrypt:
-+ * ---------------------------------------------------------------------
-+ * LibTomCrypt, modular cryptographic library -- Tom St Denis
-+ *
-+ * LibTomCrypt is a library that provides various cryptographic
-+ * algorithms in a highly modular and flexible manner.
-+ *
-+ * The library is free for all purposes without any express
-+ * guarantee it works.
-+ *
-+ * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.com
-+ */
-+
-+/*
-+ * Modifications in packet-corosync-totemnet.c done by Masatake YAMATO
-+ * ---------------------------------------------------------------------
-+ *
-+ * - added `corocrypto' as symbol prefix to some symbols, and
-+ * - added `static' modifier to functions and symbols to narrow the scope.
-+ *
-+ */
-+struct sober128_prng {
-+ unsigned long R[17], /* Working storage for the shift register */
-+ initR[17], /* saved register contents */
-+ konst, /* key dependent constant */
-+ sbuf; /* partial word encryption buffer */
-+
-+ int nbuf, /* number of part-word stream bits buffered */
-+ flag, /* first add_entropy call or not? */
-+ set; /* did we call add_entropy to set key? */
-+
-+};
-+
-+static int corocrypto_sober128_start(struct sober128_prng *prng);
-+static int corocrypto_sober128_add_entropy(const unsigned char *buf, unsigned long len, struct sober128_prng *prng);
-+static unsigned long corocrypto_sober128_read(unsigned char *buf, unsigned long len, struct sober128_prng *prng);
-+
-+
-+/*
-+ * Dissector body
-+ */
-+
-+#define PORT_COROSYNC_TOTEMNET 5405
-+
-+/* Forward declaration we need below */
-+void proto_reg_handoff_corosync_totemnet(void);
-+
-+/* Initialize the protocol and registered fields */
-+static int proto_corosync_totemnet = -1;
-+
-+/* field of struct security_header */
-+static int hf_corosync_totemnet_security_header_hash_digest = -1;
-+static int hf_corosync_totemnet_security_header_salt = -1;
-+
-+/* configurable parameters */
-+static guint corosync_totemnet_port = PORT_COROSYNC_TOTEMNET;
-+static gchar* corosync_totemnet_private_key = NULL;
-+
-+/* Initialize the subtree pointers */
-+static gint ett_corosync_totemnet_security_header = -1;
-+
-+
-+#define HMAC_HASH_SIZE 20
-+#define SALT_SIZE 16
-+
-+
-+
-+static int
-+dissect_corosync_totemnet_security_header(tvbuff_t *tvb,
-+ packet_info *pinfo, proto_tree *parent_tree)
-+{
-+ proto_item *item;
-+ proto_tree *tree;
-+
-+
-+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
-+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "COROSYNC/TOTEMNET");
-+
-+ if (check_col(pinfo->cinfo, COL_INFO))
-+ col_clear(pinfo->cinfo, COL_INFO);
-+
-+ if (parent_tree)
-+ {
-+ item = proto_tree_add_item(parent_tree, proto_corosync_totemnet, tvb, 0,
-+ -1, FALSE);
-+ tree = proto_item_add_subtree(item, ett_corosync_totemnet_security_header);
-+
-+ proto_tree_add_item(tree,
-+ hf_corosync_totemnet_security_header_hash_digest,
-+ tvb, 0, HMAC_HASH_SIZE, FALSE);
-+ proto_tree_add_item(tree,
-+ hf_corosync_totemnet_security_header_salt,
-+ tvb, HMAC_HASH_SIZE, SALT_SIZE, FALSE);
-+
-+ }
-+ return HMAC_HASH_SIZE + SALT_SIZE;
-+}
-+
-+/* About totemnet.c of corosync cluster engine:
-+ *
-+ * dissect_corosynec_totemnet_with_decryption() is derived from
-+ * totemnet.c in corosync.
-+ *
-+ * ---------------------------------------------------------------------
-+ * Copyright (c) 2005 MontaVista Software, Inc.
-+ * Copyright (c) 2006-2007 Red Hat, Inc.
-+ * Copyright (c) 2006 Sun Microsystems, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Author: Steven Dake (sdake@redhat.com)
-+
-+ * This software licensed under BSD license, the text of which follows:
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ * - Redistributions of source code must retain the above copyright notice,
-+ * this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ * this list of conditions and the following disclaimer in the documentation
-+ * and/or other materials provided with the distribution.
-+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived from this
-+ * software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
