Update.
2001-12-13 Ulrich Drepper <drepper@redhat.com> * crypt/md5.c (md5_process_bytes): Correct handling of alignment. Patch by Eric Sharkey <sharkey@netrics.com>. * crypt/md5test.c (main): Add test for multiple calls to __md5_process_bytes to itererate over input string.
This commit is contained in:
parent
7afc594790
commit
0838e0b926
|
@ -1,3 +1,11 @@
|
||||||
|
2001-12-13 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* crypt/md5.c (md5_process_bytes): Correct handling of alignment.
|
||||||
|
Patch by Eric Sharkey <sharkey@netrics.com>.
|
||||||
|
|
||||||
|
* crypt/md5test.c (main): Add test for multiple calls to
|
||||||
|
__md5_process_bytes to itererate over input string.
|
||||||
|
|
||||||
2001-12-12 Ulrich Drepper <drepper@redhat.com>
|
2001-12-12 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Mostly the code
|
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Mostly the code
|
||||||
|
|
34
crypt/md5.c
34
crypt/md5.c
|
@ -1,6 +1,6 @@
|
||||||
/* Functions to compute MD5 message digest of files or memory blocks.
|
/* Functions to compute MD5 message digest of files or memory blocks.
|
||||||
according to the definition of MD5 in RFC 1321 from April 1992.
|
according to the definition of MD5 in RFC 1321 from April 1992.
|
||||||
Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
|
Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
@ -217,8 +217,6 @@ md5_process_bytes (buffer, len, ctx)
|
||||||
size_t len;
|
size_t len;
|
||||||
struct md5_ctx *ctx;
|
struct md5_ctx *ctx;
|
||||||
{
|
{
|
||||||
//const void aligned_buffer = buffer;
|
|
||||||
|
|
||||||
/* When we already have some bits in our internal buffer concatenate
|
/* When we already have some bits in our internal buffer concatenate
|
||||||
both inputs first. */
|
both inputs first. */
|
||||||
if (ctx->buflen != 0)
|
if (ctx->buflen != 0)
|
||||||
|
@ -226,9 +224,6 @@ md5_process_bytes (buffer, len, ctx)
|
||||||
size_t left_over = ctx->buflen;
|
size_t left_over = ctx->buflen;
|
||||||
size_t add = 128 - left_over > len ? len : 128 - left_over;
|
size_t add = 128 - left_over > len ? len : 128 - left_over;
|
||||||
|
|
||||||
/* Only put full words in the buffer. */
|
|
||||||
add -= add % __alignof__ (md5_uint32);
|
|
||||||
|
|
||||||
memcpy (&ctx->buffer[left_over], buffer, add);
|
memcpy (&ctx->buffer[left_over], buffer, add);
|
||||||
ctx->buflen += add;
|
ctx->buflen += add;
|
||||||
|
|
||||||
|
@ -247,11 +242,30 @@ md5_process_bytes (buffer, len, ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Process available complete blocks. */
|
/* Process available complete blocks. */
|
||||||
if (len > 64)
|
if (len >= 64)
|
||||||
{
|
{
|
||||||
md5_process_block (buffer, len & ~63, ctx);
|
#if !_STRING_ARCH_unaligned
|
||||||
buffer = (const char *) buffer + (len & ~63);
|
/* To check alignment gcc has an appropriate operator. Other
|
||||||
len &= 63;
|
compilers don't. */
|
||||||
|
# if __GNUC__ >= 2
|
||||||
|
# define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
|
||||||
|
# else
|
||||||
|
# define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
|
||||||
|
# endif
|
||||||
|
if (UNALIGNED_P (buffer))
|
||||||
|
while (len > 64)
|
||||||
|
{
|
||||||
|
md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
|
||||||
|
buffer = (const char *) buffer + 64;
|
||||||
|
len -= 64;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
md5_process_block (buffer, len & ~63, ctx);
|
||||||
|
buffer = (const char *) buffer + (len & ~63);
|
||||||
|
len &= 63;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move remaining bytes in internal buffer. */
|
/* Move remaining bytes in internal buffer. */
|
||||||
|
|
|
@ -35,10 +35,19 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
for (cnt = 0; cnt < (int) (sizeof (tests) / sizeof (tests[0])); ++cnt)
|
for (cnt = 0; cnt < (int) (sizeof (tests) / sizeof (tests[0])); ++cnt)
|
||||||
{
|
{
|
||||||
|
int i;
|
||||||
|
int j;
|
||||||
|
|
||||||
__md5_init_ctx (&ctx);
|
__md5_init_ctx (&ctx);
|
||||||
__md5_process_bytes (tests[cnt].input, strlen (tests[cnt].input), &ctx);
|
__md5_process_bytes (tests[cnt].input, strlen (tests[cnt].input), &ctx);
|
||||||
__md5_finish_ctx (&ctx, sum);
|
__md5_finish_ctx (&ctx, sum);
|
||||||
result |= memcmp (tests[cnt].result, sum, 16);
|
result |= memcmp (tests[cnt].result, sum, 16);
|
||||||
|
|
||||||
|
__md5_init_ctx (&ctx);
|
||||||
|
for (i = 0; tests[cnt].input[i] != '\0'; ++i)
|
||||||
|
__md5_process_bytes (&tests[cnt].input[i], 1, &ctx);
|
||||||
|
__md5_finish_ctx (&ctx, sum);
|
||||||
|
result |= memcmp (tests[cnt].result, sum, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue