aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-02-16 09:56:18 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-02-16 09:56:18 +0000
commit8415b4a2714b9092c9bb6b2622a2fab60e6cc594 (patch)
treeb41ff6dd750b4964c0c26aad2acc32c38f011ae0
parente4916145ef9743b0f417fbec86888f29b5622276 (diff)
removed usage of a silly macro instead of the actual functions memcpy
and memset
-rw-r--r--lib/md5.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/md5.c b/lib/md5.c
index ab76dfc5a..a1343d670 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -92,9 +92,6 @@ static void MD5Transform(UINT4 [4], unsigned char [64]);
static void Encode(unsigned char *, UINT4 *, unsigned int);
static void Decode(UINT4 *, unsigned char *, unsigned int);
-#define MD5_memcpy(dst,src,len) memcpy(dst,src,len)
-#define MD5_memset(dst,val,len) memset(dst,val,len)
-
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,
@@ -174,7 +171,7 @@ unsigned int inputLen; /* length of input block */
/* Transform as many times as possible. */
if (inputLen >= partLen) {
- MD5_memcpy((void *)&context->buffer[bufindex], (void *)input, partLen);
+ memcpy((void *)&context->buffer[bufindex], (void *)input, partLen);
MD5Transform(context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
@@ -186,8 +183,7 @@ unsigned int inputLen; /* length of input block */
i = 0;
/* Buffer remaining input */
- MD5_memcpy((void *)&context->buffer[bufindex], (void *)&input[i],
- inputLen-i);
+ memcpy((void *)&context->buffer[bufindex], (void *)&input[i], inputLen-i);
}
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
@@ -215,7 +211,7 @@ struct md5_ctx *context; /* context */
Encode (digest, context->state, 16);
/* Zeroize sensitive information. */
- MD5_memset ((void *)context, 0, sizeof (*context));
+ memset ((void *)context, 0, sizeof (*context));
}
/* MD5 basic transformation. Transforms state based on block. */
@@ -305,7 +301,7 @@ unsigned char block[64];
state[3] += d;
/* Zeroize sensitive information. */
- MD5_memset ((void *)x, 0, sizeof (x));
+ memset((void *)x, 0, sizeof (x));
}
/* Encodes input (UINT4) into output (unsigned char). Assumes len is