mirror of
https://github.com/adulau/ssldump.git
synced 2024-11-22 01:17:04 +00:00
Clean debug functions, remove duplicates
This commit is contained in:
William Robinet
parent
dd5593e5b8
commit
eeb45211fe
4 changed files with 2 additions and 193 deletions
|
|
@ -5,12 +5,12 @@ ssldump_SOURCES = \
|
||||||
base/pcap-snoop.c\
|
base/pcap-snoop.c\
|
||||||
base/network.c\
|
base/network.c\
|
||||||
base/proto_mod.c\
|
base/proto_mod.c\
|
||||||
base/common.c\
|
|
||||||
ssl/ssl_analyze.c\
|
ssl/ssl_analyze.c\
|
||||||
null/null_analyze.c\
|
null/null_analyze.c\
|
||||||
common/lib/r_data.c\
|
common/lib/r_data.c\
|
||||||
common/lib/r_assoc.c\
|
common/lib/r_assoc.c\
|
||||||
common/lib/r_errors.c\
|
common/lib/r_errors.c\
|
||||||
|
common/lib/debug.c\
|
||||||
base/tcppack.c\
|
base/tcppack.c\
|
||||||
base/tcpconn.c\
|
base/tcpconn.c\
|
||||||
ssl/ssldecode.c\
|
ssl/ssldecode.c\
|
||||||
|
|
@ -23,6 +23,7 @@ ssldump_SOURCES = \
|
||||||
ssldump_CPPFLAGS = \
|
ssldump_CPPFLAGS = \
|
||||||
-I$(top_srcdir)\
|
-I$(top_srcdir)\
|
||||||
-I$(top_srcdir)/common/include\
|
-I$(top_srcdir)/common/include\
|
||||||
|
-I$(top_srcdir)/common/lib\
|
||||||
-I$(top_srcdir)/null\
|
-I$(top_srcdir)/null\
|
||||||
-I$(top_srcdir)/ssl\
|
-I$(top_srcdir)/ssl\
|
||||||
-I$(top_srcdir)/base\
|
-I$(top_srcdir)/base\
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
<ekr@rtfm.com> 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 <r_common.h>
|
|
||||||
|
|
||||||
int xdump(label,data,len)
|
|
||||||
char *label;
|
|
||||||
UCHAR *data;
|
|
||||||
int len;
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
printf("%s[%d]",label,len);
|
|
||||||
for(i=0;i<len;i++){
|
|
||||||
if((len>8) && !(i%20)) printf("\n");
|
|
||||||
printf("%.2x ",data[i]&255);
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("\n");
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
68
base/debug.c
68
base/debug.c
|
|
@ -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
|
|
||||||
<ekr@rtfm.com> 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 <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int debug(int class,char *format,...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap,format);
|
|
||||||
vfprintf(stderr,format,ap);
|
|
||||||
fprintf(stderr,"\n");
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
58
base/debug.h
58
base/debug.h
|
|
@ -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
|
|
||||||
<ekr@rtfm.com> 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
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue