@@ -1,2773 +0,0 @@
-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];
|