1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

md5.c renamed MD5* to my_MD5* to avoid clashes with openssl library

Browse Source 
md5.c   	when linking to it
md5.h   	renamed MD5* to my_MD5* to avoid clashes with openssl library
md5.h   	when linking to it


sql/md5.h:
  renamed MD5* to my_MD5* to avoid clashes with openssl library
  when linking to it
sql/md5.c:
  renamed MD5* to my_MD5* to avoid clashes with openssl library
  when linking to it
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2001-05-31 01:59:23 +03:00
parent f5e06429a6
commit 5041af524f
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BitKeeper/etc/logging_ok
View File

@ -1,17 +1 @@
heikki@donna.mysql.fi tonu@hundin.mysql.fi
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
jcole@abel.spaceapes.com
jcole@main.burghcom.com
jcole@tetra.spaceapes.com
monty@donna.mysql.fi
monty@tik.mysql.fi
monty@work.mysql.com
mwagner@evoq.mwagner.org
paul@central.snake.net
root@x3.internalnet
sasha@mysql.sashanet.com
serg@serg.mysql.com
tim@threads.polyesthetic.msg
tim@work.mysql.com
tonu@x3.internalnet

14
sql/md5.c
View File

@ -108,7 +108,7 @@ Rotation is separate from addition to prevent recomputation.
/* MD5 initialization. Begins an MD5 operation, writing a new context. /* MD5 initialization. Begins an MD5 operation, writing a new context.
*/ */
void MD5Init (MD5_CTX *context) /* context */ void my_MD5Init (my_MD5_CTX *context) /* context */
{ {
context->count[0] = context->count[1] = 0; context->count[0] = context->count[1] = 0;
/* Load magic initialization constants. /* Load magic initialization constants.
@ -123,8 +123,8 @@ void MD5Init (MD5_CTX *context) /* context */
operation, processing another message block, and updating the operation, processing another message block, and updating the
context. context.
*/ */
void MD5Update (context, input, inputLen) void my_MD5Update (context, input, inputLen)
MD5_CTX *context; /* context */ my_MD5_CTX *context; /* context */
unsigned char *input; /* input block */ unsigned char *input; /* input block */
unsigned int inputLen; /* length of input block */ unsigned int inputLen; /* length of input block */
{ {
@ -164,9 +164,9 @@ unsigned int inputLen; /* length of input block */
/* MD5 finalization. Ends an MD5 message-digest operation, writing the /* MD5 finalization. Ends an MD5 message-digest operation, writing the
the message digest and zeroizing the context. the message digest and zeroizing the context.
*/ */
void MD5Final (digest, context) void my_MD5Final (digest, context)
unsigned char digest[16]; /* message digest */ unsigned char digest[16]; /* message digest */
MD5_CTX *context; /* context */ my_MD5_CTX *context; /* context */
{ {
unsigned char bits[8]; unsigned char bits[8];
unsigned int idx, padLen; unsigned int idx, padLen;
@ -178,10 +178,10 @@ MD5_CTX *context; /* context */
*/ */
idx = (unsigned int)((context->count[0] >> 3) & 0x3f); idx = (unsigned int)((context->count[0] >> 3) & 0x3f);
padLen = (idx < 56) ? (56 - idx) : (120 - idx); padLen = (idx < 56) ? (56 - idx) : (120 - idx);
MD5Update (context, PADDING, padLen); my_MD5Update (context, PADDING, padLen);
/* Append length (before padding) */ /* Append length (before padding) */
MD5Update (context, bits, 8); my_MD5Update (context, bits, 8);
/* Store state in digest */ /* Store state in digest */
Encode (digest, context->state, 16); Encode (digest, context->state, 16);

12
sql/md5.h
View File

@ -57,22 +57,20 @@ If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
#else #else
#define PROTO_LIST(list) () #define PROTO_LIST(list) ()
#endif #endif
/* MD5 context. */ /* MD5 context. */
typedef struct { typedef struct {
UINT4 state[4]; /* state (ABCD) */ UINT4 state[4]; /* state (ABCD) */
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */ unsigned char buffer[64]; /* input buffer */
} MD5_CTX; } my_MD5_CTX;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void MD5Init PROTO_LIST ((MD5_CTX *)); void my_MD5Init PROTO_LIST ((my_MD5_CTX *));
void MD5Update PROTO_LIST void my_MD5Update PROTO_LIST
((MD5_CTX *, unsigned char *, unsigned int)); ((my_MD5_CTX *, unsigned char *, unsigned int));
void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); void my_MD5Final PROTO_LIST ((unsigned char [16], my_MD5_CTX *));
#ifdef __cplusplus #ifdef __cplusplus
} }