From: Aleš Křenek Date: Tue, 13 Nov 2007 12:03:59 +0000 (+0000) Subject: make internal md5 static X-Git-Tag: glite-yaim-lb_R_4_0_0_5~10 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2e85a3aa1bc0f8484d5e889ecbcce012671570ca;p=jra1mw.git make internal md5 static --- diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile index 4ade84f..2408183 100644 --- a/org.glite.jobid.api-c/Makefile +++ b/org.glite.jobid.api-c/Makefile @@ -27,7 +27,7 @@ LINK:=libtool --mode=link ${CC} ${LDFLAGS} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} INSTALL:=libtool --mode=install install -LIBOBJS:=cjobid.o strmd5.o md5_dgst.o +LIBOBJS:=cjobid.o strmd5.o HDRS:=cjobid.h strmd5.h LIBLOBJS:=${LIBOBJS:.o=.lo} diff --git a/org.glite.jobid.api-c/src/md32_common.h b/org.glite.jobid.api-c/src/md32_common.h index 0e625a8..0b8496f 100644 --- a/org.glite.jobid.api-c/src/md32_common.h +++ b/org.glite.jobid.api-c/src/md32_common.h @@ -396,7 +396,7 @@ * Time for some action:-) */ -int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len) +MD5_JOBID_PROTO int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len) { const unsigned char *data=data_; register HASH_LONG * p; @@ -513,7 +513,7 @@ int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len) } -void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data) +MD5_JOBID_PROTO void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data) { #if defined(HASH_BLOCK_DATA_ORDER_ALIGNED) if ((((size_t)data)%4) == 0) @@ -522,7 +522,7 @@ void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data) else #if !defined(HASH_BLOCK_DATA_ORDER) { - memcpy (c->data,data,HASH_CBLOCK); + HASH_BLOCK_DATA_ORDER_ALIGNED (c,c->data,1); } #endif @@ -533,7 +533,7 @@ void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data) } -int HASH_FINAL (unsigned char *md, HASH_CTX *c) +MD5_JOBID_PROTO int HASH_FINAL (unsigned char *md, HASH_CTX *c) { register HASH_LONG *p; register unsigned long l; diff --git a/org.glite.jobid.api-c/src/md5.h b/org.glite.jobid.api-c/src/md5.h index 468a87a..7778afc 100644 --- a/org.glite.jobid.api-c/src/md5.h +++ b/org.glite.jobid.api-c/src/md5.h @@ -84,12 +84,11 @@ extern "C" { #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define MD5_LONG unsigned long #define MD5_LONG_LOG2 3 -/* + * _CRAY note. I could declare short, but I have no idea what impact * does it have on performance on none-T3E machines. I could declare * int, but at least on C90 sizeof(int) can be chosen at compile time. - * So I've chosen long... - * + * So I've chosen long... * */ #else #define MD5_LONG unsigned int @@ -107,11 +106,11 @@ typedef struct MD5state_st unsigned int num; } MD5_CTX; -int MD5_Init(MD5_CTX *c); -int MD5_Update(MD5_CTX *c, const void *data, size_t len); -int MD5_Final(unsigned char *md, MD5_CTX *c); -unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md); -void MD5_Transform(MD5_CTX *c, const unsigned char *b); +MD5_JOBID_PROTO int MD5_Init(MD5_CTX *c); +MD5_JOBID_PROTO int MD5_Update(MD5_CTX *c, const void *data, size_t len); +MD5_JOBID_PROTO int MD5_Final(unsigned char *md, MD5_CTX *c); +MD5_JOBID_PROTO unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md); +MD5_JOBID_PROTO void MD5_Transform(MD5_CTX *c, const unsigned char *b); #ifdef __cplusplus } #endif diff --git a/org.glite.jobid.api-c/src/md5_dgst.c b/org.glite.jobid.api-c/src/md5_dgst.c index 152a24d..df6d163 100644 --- a/org.glite.jobid.api-c/src/md5_dgst.c +++ b/org.glite.jobid.api-c/src/md5_dgst.c @@ -56,6 +56,10 @@ * [including the GNU Public Licence.] */ +#ifndef MD5_JOBID_PROTO +#define MD5_JOBID_PROTO +#endif + #include #include "md5_locl.h" /* ljocha @@ -72,7 +76,7 @@ const char MD5_version[]="MD5" OPENSSL_VERSION_PTEXT; #define INIT_DATA_C (unsigned long)0x98badcfeL #define INIT_DATA_D (unsigned long)0x10325476L -int MD5_Init(MD5_CTX *c) +MD5_JOBID_PROTO int MD5_Init(MD5_CTX *c) { c->A=INIT_DATA_A; c->B=INIT_DATA_B; @@ -85,7 +89,7 @@ int MD5_Init(MD5_CTX *c) } #ifndef md5_block_host_order -void md5_block_host_order (MD5_CTX *c, const void *data, size_t num) +MD5_JOBID_PROTO void md5_block_host_order (MD5_CTX *c, const void *data, size_t num) { const MD5_LONG *X=data; register unsigned MD32_REG_T A,B,C,D; @@ -178,7 +182,7 @@ void md5_block_host_order (MD5_CTX *c, const void *data, size_t num) #ifdef X #undef X #endif -void md5_block_data_order (MD5_CTX *c, const void *data_, size_t num) +MD5_JOBID_PROTO void md5_block_data_order (MD5_CTX *c, const void *data_, size_t num) { const unsigned char *data=data_; register unsigned MD32_REG_T A,B,C,D,l; diff --git a/org.glite.jobid.api-c/src/md5_locl.h b/org.glite.jobid.api-c/src/md5_locl.h index 94f395f..dda821c 100644 --- a/org.glite.jobid.api-c/src/md5_locl.h +++ b/org.glite.jobid.api-c/src/md5_locl.h @@ -76,8 +76,8 @@ # endif #endif -void md5_block_host_order (MD5_CTX *c, const void *p,size_t num); -void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); +MD5_JOBID_PROTO void md5_block_host_order (MD5_CTX *c, const void *p,size_t num); +MD5_JOBID_PROTO void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__) # if !defined(B_ENDIAN) diff --git a/org.glite.jobid.api-c/src/strmd5.c b/org.glite.jobid.api-c/src/strmd5.c index 410bfbe..2645c61 100755 --- a/org.glite.jobid.api-c/src/strmd5.c +++ b/org.glite.jobid.api-c/src/strmd5.c @@ -1,12 +1,17 @@ #ident "$Header$" + #include #include #include +#define MD5_JOBID_PROTO static #include "md5.h" #include "strmd5.h" +#include "md5_dgst.c" + + #warning Thread unsafe! static char mbuf[33];