X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/89e2e0c7bedb2d3ea19b90dea2c1d31198307961..ffa1470e5c7ff0e50028d085a481dc797b0b51ed:/print-esp.c

diff --git a/print-esp.c b/print-esp.c
index 08bb8915..cb7ce223 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.52 2004-07-16 14:05:59 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.55.2.1 2005-04-21 06:44:57 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -50,10 +50,6 @@ static const char rcsid[] _U_ =
 #include "ip6.h"
 #endif
 
-#if defined(__MINGW32__) || defined(__WATCOMC__)
-extern char *strsep(char **stringp, const char *delim); /* Missing/strsep.c */
-#endif
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -79,7 +75,7 @@ struct sa_list {
 	const EVP_CIPHER *evp;
 	int		ivlen;
 	int		authlen;
-	char		secret[256];  /* is that big enough for all secrets? */
+	u_char		secret[256];  /* is that big enough for all secrets? */
 	int		secretlen;
 };
 
@@ -104,7 +100,7 @@ static void esp_print_addsa(netdissect_options *ndo,
 }
 
 
-static int hexdigit(netdissect_options *ndo, char hex)
+static u_int hexdigit(netdissect_options *ndo, char hex)
 {
 	if (hex >= '0' && hex <= '9')
 		return (hex - '0');
@@ -118,9 +114,9 @@ static int hexdigit(netdissect_options *ndo, char hex)
 	}
 }
 
-static int hex2byte(netdissect_options *ndo, char *hexstring)
+static u_int hex2byte(netdissect_options *ndo, char *hexstring)
 {
-	int byte;
+	u_int byte;
 
 	byte = (hexdigit(ndo, hexstring[0]) << 4) + hexdigit(ndo, hexstring[1]);
 	return byte;
@@ -223,7 +219,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line)
 
 	if (decode) {
 		char *colon, *p;
-		char  espsecret_key[256];
+		u_char espsecret_key[256];
 		int len;
 		size_t i;
 		const EVP_CIPHER *evp;
@@ -357,7 +353,7 @@ esp_print(netdissect_options *ndo,
 #endif
 	int advance;
 	int len;
-	char *secret;
+	u_char *secret;
 	int ivlen = 0;
 	u_char *ivoff;
 	u_char *p;