From eeb45211fe04f3ba3e6b4785a53f4517853dbe5d Mon Sep 17 00:00:00 2001 From: William Robinet Date: Fri, 4 Sep 2020 14:13:59 +0200 Subject: [PATCH] Clean debug functions, remove duplicates --- Makefile.am | 3 ++- base/common.c | 66 ------------------------------------------------- base/debug.c | 68 --------------------------------------------------- base/debug.h | 58 ------------------------------------------- 4 files changed, 2 insertions(+), 193 deletions(-) delete mode 100644 base/common.c delete mode 100644 base/debug.c delete mode 100644 base/debug.h diff --git a/Makefile.am b/Makefile.am index 05aea85..df72dfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,12 @@ ssldump_SOURCES = \ base/pcap-snoop.c\ base/network.c\ base/proto_mod.c\ - base/common.c\ ssl/ssl_analyze.c\ null/null_analyze.c\ common/lib/r_data.c\ common/lib/r_assoc.c\ common/lib/r_errors.c\ + common/lib/debug.c\ base/tcppack.c\ base/tcpconn.c\ ssl/ssldecode.c\ @@ -23,6 +23,7 @@ ssldump_SOURCES = \ ssldump_CPPFLAGS = \ -I$(top_srcdir)\ -I$(top_srcdir)/common/include\ + -I$(top_srcdir)/common/lib\ -I$(top_srcdir)/null\ -I$(top_srcdir)/ssl\ -I$(top_srcdir)/base\ diff --git a/base/common.c b/base/common.c deleted file mode 100644 index 2f29bf0..0000000 --- a/base/common.c +++ /dev/null @@ -1,66 +0,0 @@ -/** - common.c - - - Copyright (C) 1999-2000 RTFM, Inc. - All Rights Reserved - - This package is a SSLv3/TLS protocol analyzer written by Eric Rescorla - and licensed by RTFM, Inc. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - - This product includes software developed by Eric Rescorla for - RTFM, Inc. - - 4. Neither the name of RTFM, Inc. nor the name of Eric Rescorla may be - used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY ERIC RESCORLA AND RTFM, INC. ``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 REGENTS 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 SUCH DAMAGE. - - $Id: common.c,v 1.2 2000/10/17 16:09:57 ekr Exp $ - - - ekr@rtfm.com Tue Dec 29 09:59:39 1998 - */ - - -static char *RCSSTRING="$Id: common.c,v 1.2 2000/10/17 16:09:57 ekr Exp $"; - -#include - -int xdump(label,data,len) - char *label; - UCHAR *data; - int len; - { - int i; - - printf("%s[%d]",label,len); - for(i=0;i8) && !(i%20)) printf("\n"); - printf("%.2x ",data[i]&255); - } - - printf("\n"); - return(0); - } diff --git a/base/debug.c b/base/debug.c deleted file mode 100644 index a0ff54b..0000000 --- a/base/debug.c +++ /dev/null @@ -1,68 +0,0 @@ -/** - debug.c - - - Copyright (C) 1999-2000 RTFM, Inc. - All Rights Reserved - - This package is a SSLv3/TLS protocol analyzer written by Eric Rescorla - and licensed by RTFM, Inc. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - - This product includes software developed by Eric Rescorla for - RTFM, Inc. - - 4. Neither the name of RTFM, Inc. nor the name of Eric Rescorla may be - used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY ERIC RESCORLA AND RTFM, INC. ``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 REGENTS 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 SUCH DAMAGE. - - $Id: debug.c,v 1.2 2000/10/17 16:09:57 ekr Exp $ - - - ekr@rtfm.com Wed Jan 6 17:08:58 1999 - */ - - -static char *RCSSTRING="$Id: debug.c,v 1.2 2000/10/17 16:09:57 ekr Exp $"; - -#ifdef DEBUG - -#include -#include - -int debug(int class,char *format,...) - { - va_list ap; - - va_start(ap,format); - vfprintf(stderr,format,ap); - fprintf(stderr,"\n"); - return(0); - } - -#endif - - - - diff --git a/base/debug.h b/base/debug.h deleted file mode 100644 index b5d45de..0000000 --- a/base/debug.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - debug.h - - - Copyright (C) 1999-2000 RTFM, Inc. - All Rights Reserved - - This package is a SSLv3/TLS protocol analyzer written by Eric Rescorla - and licensed by RTFM, Inc. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - - This product includes software developed by Eric Rescorla for - RTFM, Inc. - - 4. Neither the name of RTFM, Inc. nor the name of Eric Rescorla may be - used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY ERIC RESCORLA AND RTFM, INC. ``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 REGENTS 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 SUCH DAMAGE. - - $Id: debug.h,v 1.2 2000/10/17 16:09:57 ekr Exp $ - - - ekr@rtfm.com Wed Jan 6 17:13:00 1999 - */ - - -#ifndef _debug_h -#define _debug_h - -#ifdef DEBUG -#define DBG(a) debug a -int debug(int class,char *format,...); -#else -#define DBG(a) -#endif - -#endif -