--------------------- PatchSet 11748 Date: 2007/11/20 14:11:21 Author: hno Branch: HEAD Tag: (none) Log: Drop the RSA licensed MD5 implementation, and use the one shipped with Squid instead Members: helpers/basic_auth/squid_radius_auth/Makefile.am:1.1->1.2 helpers/basic_auth/squid_radius_auth/Makefile.in:1.4->1.5 helpers/basic_auth/squid_radius_auth/md5.c:1.1->1.2(DEAD) helpers/basic_auth/squid_radius_auth/md5.h:1.1->1.2(DEAD) helpers/basic_auth/squid_radius_auth/squid_rad_auth.c:1.1->1.2 helpers/basic_auth/squid_radius_auth/util.c:1.1->1.2 helpers/basic_auth/squid_radius_auth/util.h:1.1->1.2 Index: squid/helpers/basic_auth/squid_radius_auth/Makefile.am =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/squid_radius_auth/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/squid_radius_auth/Makefile.am 5 Sep 2007 22:14:50 -0000 1.1 +++ squid/helpers/basic_auth/squid_radius_auth/Makefile.am 20 Nov 2007 14:11:21 -0000 1.2 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.1 2007/09/05 22:14:50 hno Exp $ +# $Id: Makefile.am,v 1.2 2007/11/20 14:11:21 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,8 +11,8 @@ EXTRA_DIST = squid_radius_auth.8 squid_radius_auth_SOURCES = \ squid_rad_auth.c \ - md5.c md5.h \ radius.h \ util.c util.h -LDADD = $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(SSLLIB) $(XTRA_LIBS) +INCLUDES = -I$(top_srcdir)/include Index: squid/helpers/basic_auth/squid_radius_auth/Makefile.in =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/squid_radius_auth/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- squid/helpers/basic_auth/squid_radius_auth/Makefile.in 12 Nov 2007 01:14:04 -0000 1.4 +++ squid/helpers/basic_auth/squid_radius_auth/Makefile.in 20 Nov 2007 14:11:21 -0000 1.5 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.4 2007/11/12 01:14:04 hno Exp $ +# $Id: Makefile.in,v 1.5 2007/11/20 14:11:21 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -59,12 +59,12 @@ am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(libexec_PROGRAMS) -am_squid_radius_auth_OBJECTS = squid_rad_auth.$(OBJEXT) md5.$(OBJEXT) \ - util.$(OBJEXT) +am_squid_radius_auth_OBJECTS = squid_rad_auth.$(OBJEXT) util.$(OBJEXT) squid_radius_auth_OBJECTS = $(am_squid_radius_auth_OBJECTS) squid_radius_auth_LDADD = $(LDADD) am__DEPENDENCIES_1 = -squid_radius_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) +squid_radius_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -267,11 +267,11 @@ EXTRA_DIST = squid_radius_auth.8 squid_radius_auth_SOURCES = \ squid_rad_auth.c \ - md5.c md5.h \ radius.h \ util.c util.h -LDADD = $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(SSLLIB) $(XTRA_LIBS) +INCLUDES = -I$(top_srcdir)/include all: all-am .SUFFIXES: @@ -338,7 +338,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squid_rad_auth.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ --- squid/helpers/basic_auth/squid_radius_auth/md5.c Tue Nov 20 14:54:49 2007 +++ /dev/null Tue Nov 20 14:54:49 2007 @@ -1,333 +0,0 @@ -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function. - -License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work. - -RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. - -These notices must be retained in any copies of any part of this -documentation and/or software. - */ - -#include "md5.h" - -/* Constants for MD5Transform routine. - */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - -static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64])); -static void Encode PROTO_LIST - ((unsigned char *, UINT4 *, unsigned int)); -static void Decode PROTO_LIST - ((UINT4 *, unsigned char *, unsigned int)); -static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); -static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int)); - -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G, H and I are basic MD5 functions. - */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits. - */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. -Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) { \ - (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) { \ - (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) { \ - (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) { \ - (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } - -/* MD5 initialization. Begins an MD5 operation, writing a new context. - */ -void MD5Init (context) -MD5_CTX *context; /* context */ -{ - context->count[0] = context->count[1] = 0; - /* Load magic initialization constants. -*/ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; -} - -/* MD5 block update operation. Continues an MD5 message-digest - operation, processing another message block, and updating the - context. - */ -void MD5Update (context, input, inputLen) -MD5_CTX *context; /* context */ -unsigned char *input; /* input block */ -unsigned int inputLen; /* length of input block */ -{ - unsigned int i, index, partLen; - - /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); - - /* Update number of bits */ - if ((context->count[0] += ((UINT4)inputLen << 3)) - < ((UINT4)inputLen << 3)) - context->count[1]++; - context->count[1] += ((UINT4)inputLen >> 29); - - partLen = 64 - index; - - /* Transform as many times as possible. -*/ - if (inputLen >= partLen) { - MD5_memcpy - ((POINTER)&context->buffer[index], (POINTER)input, partLen); - MD5Transform (context->state, context->buffer); - - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); - - index = 0; - } - else - i = 0; - - /* Buffer remaining input */ - MD5_memcpy - ((POINTER)&context->buffer[index], (POINTER)&input[i], - inputLen-i); -} - -/* MD5 finalization. Ends an MD5 message-digest operation, writing the - the message digest and zeroizing the context. - */ -void MD5Final (digest, context) -unsigned char digest[16]; /* message digest */ -MD5_CTX *context; /* context */ -{ - unsigned char bits[8]; - unsigned int index, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. -*/ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); - - /* Store state in digest */ - Encode (digest, context->state, 16); - - /* Zeroize sensitive information. -*/ - MD5_memset ((POINTER)context, 0, sizeof (*context)); -} - -/* MD5 basic transformation. Transforms state based on block. - */ -static void MD5Transform (state, block) -UINT4 state[4]; -unsigned char block[64]; -{ - UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. -*/ - MD5_memset ((POINTER)x, 0, sizeof (x)); -} - -/* Encodes input (UINT4) into output (unsigned char). Assumes len is - a multiple of 4. - */ -static void Encode (output, input, len) -unsigned char *output; -UINT4 *input; -unsigned int len; -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = (unsigned char)(input[i] & 0xff); - output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); - output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); - output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); - } -} - -/* Decodes input (unsigned char) into output (UINT4). Assumes len is - a multiple of 4. - */ -static void Decode (output, input, len) -UINT4 *output; -unsigned char *input; -unsigned int len; -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | - (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); -} - -/* Note: Replace "for loop" with standard memcpy if possible. - */ - -static void MD5_memcpy (output, input, len) -POINTER output; -POINTER input; -unsigned int len; -{ - unsigned int i; - - for (i = 0; i < len; i++) - output[i] = input[i]; -} - -/* Note: Replace "for loop" with standard memset if possible. - */ -static void MD5_memset (output, value, len) -POINTER output; -int value; -unsigned int len; -{ - unsigned int i; - - for (i = 0; i < len; i++) - ((char *)output)[i] = (char)value; -} --- squid/helpers/basic_auth/squid_radius_auth/md5.h Tue Nov 20 14:54:49 2007 +++ /dev/null Tue Nov 20 14:54:49 2007 @@ -1,77 +0,0 @@ -/* GLOBAL.H - RSAREF types and constants - */ - -/* PROTOTYPES should be set to one if and only if the compiler supports - function argument prototyping. - The following makes PROTOTYPES default to 0 if it has not already - been defined with C compiler flags. - */ -#ifndef PROTOTYPES -# if __STDC__ -# define PROTOTYPES 1 -# else -# define PROTOTYPES 0 -# endif -#endif - -/* POINTER defines a generic pointer type */ -typedef unsigned char *POINTER; - -/* UINT2 defines a two byte word */ -typedef unsigned short int UINT2; - -/* UINT4 defines a four byte word */ -#if defined(__alpha) && (defined(__osf__) || defined(__linux__)) -typedef unsigned int UINT4; -#else -typedef unsigned long int UINT4; -#endif - -/* PROTO_LIST is defined depending on how PROTOTYPES is defined above. - If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it - returns an empty list. - */ -#if PROTOTYPES -#define PROTO_LIST(list) list -#else -#define PROTO_LIST(list) () -#endif - -/* MD5.H - header file for MD5C.C - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function. - -License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work. - -RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. - -These notices must be retained in any copies of any part of this -documentation and/or software. - */ - -/* MD5 context. */ -typedef struct { - UINT4 state[4]; /* state (ABCD) */ - UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ - unsigned char buffer[64]; /* input buffer */ -} MD5_CTX; - -void MD5Init PROTO_LIST ((MD5_CTX *)); -void MD5Update PROTO_LIST - ((MD5_CTX *, unsigned char *, unsigned int)); -void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); -void md5_calc PROTO_LIST ((unsigned char *output, unsigned char *input, unsigned int inlen)); - Index: squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c 5 Sep 2007 22:14:50 -0000 1.1 +++ squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c 20 Nov 2007 14:11:21 -0000 1.2 @@ -45,21 +45,51 @@ * and many others */ +#include "config.h" + +#if HAVE_SYS_TYPES_H #include +#endif +#if HAVE_SYS_SOCKET_H #include +#endif +#if HAVE_NETINET_IN_H #include +#endif +#if HAVE_SYS_TIME_H #include +#endif +#if HAVE_UNISTD_H #include +#endif +#if HAVE_FCNTL_H #include +#endif +#if HAVE_CTYPE_H #include +#endif +#if HAVE_STDIO_H #include +#endif +#if HAVE_UNISTD_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_PWD_H #include +#endif +#if HAVE_STDLIB_H #include +#endif +#if HAVE_TIME_H #include +#endif +#if HAVE_STRING_H #include +#endif #include "md5.h" #include "radius.h" @@ -83,8 +113,8 @@ static char svc_name[MAXLINE] = "radius"; static int nasport = 111; static int nasporttype = 0; -static UINT4 nas_ipaddr; -static UINT4 auth_ipaddr; +static u_int32_t nas_ipaddr; +static u_int32_t auth_ipaddr; static int retries = 30; char *progname = "squid_rad_auth"; @@ -111,10 +141,22 @@ } /* + * MD5 digest + */ +static void +md5_calc(uint8_t out[16], void *in, size_t len) +{ + MD5_CTX ctx; + MD5Init(&ctx); + MD5Update(&ctx, in, len); + MD5Final(out, &ctx); +} + +/* * Receive and verify the result. */ static int -result_recv(UINT4 host, u_short udp_port, char *buffer, int length) +result_recv(u_int32_t host, u_short udp_port, char *buffer, int length) { AUTH_HDR *auth; int totallen; @@ -241,7 +283,7 @@ int secretlen; u_char cbc[AUTH_VECTOR_LEN]; int i, j; - UINT4 ui; + u_int32_t ui; struct sockaddr_in saremote; fd_set readfds; socklen_t salen; Index: squid/helpers/basic_auth/squid_radius_auth/util.c =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/squid_radius_auth/util.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/squid_radius_auth/util.c 5 Sep 2007 22:14:50 -0000 1.1 +++ squid/helpers/basic_auth/squid_radius_auth/util.c 20 Nov 2007 14:11:21 -0000 1.2 @@ -35,18 +35,42 @@ "@(#)util.c 1.5 Copyright 1992 Livingston Enterprises Inc\n" " 2.1 Copyright 1997 Cistron Internet Services B.V."; +#include "config.h" + +#if HAVE_SYS_TYES_H #include +#endif +#if HAVE_SYS_SOCKET_H #include +#endif +#if HAVE_SYS_TIME_H #include +#endif +#if HAVE_NETINET_IN_H #include +#endif +#if HAVE_STDIO_H #include +#endif +#if HAVE_STDLIB_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_PWD_H #include +#endif +#if HAVE_TIME_H #include +#endif +#if HAVE_CTYPE_H #include +#endif +#if HAVE_SIGNAL_H #include +#endif #include "md5.h" #include "util.h" @@ -89,37 +113,37 @@ * Return an IP address in host long notation from * one supplied in standard dot notation. */ -static UINT4 ipstr2long(char *ip_str) +static u_int32_t ipstr2long(char *ip_str) { char buf[6]; char *ptr; int i; int count; - UINT4 ipaddr; + u_int32_t ipaddr; int cur_byte; - ipaddr = (UINT4)0; + ipaddr = (u_int32_t)0; for(i = 0;i < 4;i++) { ptr = buf; count = 0; *ptr = '\0'; while(*ip_str != '.' && *ip_str != '\0' && count < 4) { if(!isdigit(*ip_str)) { - return((UINT4)0); + return((u_int32_t)0); } *ptr++ = *ip_str++; count++; } if(count >= 4 || count == 0) { - return((UINT4)0); + return((u_int32_t)0); } *ptr = '\0'; cur_byte = atoi(buf); if(cur_byte < 0 || cur_byte > 255) { - return((UINT4)0); + return((u_int32_t)0); } ip_str++; - ipaddr = ipaddr << 8 | (UINT4)cur_byte; + ipaddr = ipaddr << 8 | (u_int32_t)cur_byte; } return(ipaddr); } @@ -128,7 +152,7 @@ * Return an IP address in host long notation from a host * name or address in dot notation. */ -UINT4 get_ipaddr(char *host) +u_int32_t get_ipaddr(char *host) { struct hostent *hp; @@ -136,9 +160,9 @@ return(ipstr2long(host)); } else if((hp = gethostbyname(host)) == (struct hostent *)NULL) { - return((UINT4)0); + return((u_int32_t)0); } - return(ntohl(*(UINT4 *)hp->h_addr)); + return(ntohl(*(u_int32_t *)hp->h_addr)); } Index: squid/helpers/basic_auth/squid_radius_auth/util.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/squid_radius_auth/util.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/squid_radius_auth/util.h 5 Sep 2007 22:14:50 -0000 1.1 +++ squid/helpers/basic_auth/squid_radius_auth/util.h 20 Nov 2007 14:11:21 -0000 1.2 @@ -1,2 +1,2 @@ /* util.c */ -UINT4 get_ipaddr (char *); +u_int32_t get_ipaddr (char *);