Adrian Chadd wrote:
Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid/include
Modified Files:
Tag: store_copy
Array.h md5.h
Log Message:
Merge changes from Squid-2.HEAD.
Sigh. We need to clean up these MD5 issues before they propagate further.
Has the renaming fix in Squid-3 shown ANY problems since Duane committed
it? If not, I'm proposing a cross-over to make the Squid-2 code identical.
Amos
Index: md5.h
===================================================================
RCS file: /cvsroot/squid/squid/include/md5.h,v
retrieving revision 1.12
retrieving revision 1.12.34.1
diff -C2 -d -r1.12 -r1.12.34.1
*** md5.h 29 May 2006 00:14:40 -0000 1.12
--- md5.h 27 Nov 2007 08:12:20 -0000 1.12.34.1
***************
*** 2,6 ****
#define SQUID_MD5_H
! #if USE_OPENSSL
/*
--- 2,8 ----
#define SQUID_MD5_H
! #if HAVE_SYS_TYPES_H
! #include <sys/types.h>
! #endif
/*
***************
*** 8,17 ****
* from there via some wrapper macros, and the rest of this file is ignored..
*/
! #if HAVE_OPENSSL_MD5_H
#include <openssl/md5.h>
- #else
- #error Cannot find OpenSSL headers
- #endif
/* Hack to adopt Squid to the OpenSSL syntax */
--- 10,17 ----
* from there via some wrapper macros, and the rest of this file is ignored..
*/
+ #define USE_SQUID_MD5 0
! #if USE_OPENSSL && HAVE_OPENSSL_MD5_H
#include <openssl/md5.h>
/* Hack to adopt Squid to the OpenSSL syntax */
***************
*** 22,26 ****
#define MD5Final MD5_Final
! #else /* USE_OPENSSL */
/*
--- 22,47 ----
#define MD5Final MD5_Final
! #elif USE_OPENSSL && !HAVE_OPENSSL_MD5_H
! #error Cannot find OpenSSL MD5 headers
!
! #elif HAVE_SYS_MD5_H
! /*
! * Solaris 10 provides MD5 as part of the system.
! */
! #include <sys/md5.h>
!
! /*
! * They also define MD5_CTX with different field names
! * fortunately we do not access it directly in the squid code.
! */
!
! /* Hack to adopt Squid to the OpenSSL syntax */
! #define MD5_DIGEST_CHARS MD5_DIGEST_LENGTH
!
! #else /* NEED_OWN_MD5 */
!
! /* Turn on internal MD5 code */
! #undef USE_SQUID_MD5
! #define USE_SQUID_MD5 1
/*
