Undo last change.

* lib/sha1.c, lib/md5.c: 63 != ~63.
Reported by Andreas Schwab.

diff --git a/ChangeLog b/ChangeLog
index 97d711f4c3611b6184eca9292b86cc0869895a3e..d1ad022dd1251bc9168563ab2fef6fa79bfc771b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-15  Jim Meyering  <meyering@redhat.com>
 
+       Undo last change.
+       * lib/sha1.c, lib/md5.c: 63 != ~63.
+       Reported by Andreas Schwab.
+
        sha1.c, md5.c: Hoist a redundant expression.
        * lib/sha1.c (sha1_process_bytes): AND-off the low bits in
        "ctx->buflen" only once, before calling *_process_block.

diff --git a/lib/md5.c b/lib/md5.c
index ce02a26211e6ca607de5da8433834cdfd791d8e5..2213dc1206581b936641647c1826cb8d6328bc59 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -230,9 +230,9 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
 
       if (ctx->buflen > 64)
        {
-         ctx->buflen &= 63;
-         md5_process_block (ctx->buffer, ctx->buflen, ctx);
+         md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
 
+         ctx->buflen &= 63;
          /* The regions in the following copy operation cannot overlap.  */
          memcpy (ctx->buffer,
                  &((char *) ctx->buffer)[(left_over + add) & ~63],

diff --git a/lib/sha1.c b/lib/sha1.c
index 67d5c964c6040471a3e5d0255f880ecf16075738..9c6c7ae3933d7b45a945a2404414b01bd2e4e95d 100644 (file)
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -217,9 +217,9 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
 
       if (ctx->buflen > 64)
        {
-         ctx->buflen &= 63;
-         sha1_process_block (ctx->buffer, ctx->buflen, ctx);
+         sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
 
+         ctx->buflen &= 63;
          /* The regions in the following copy operation cannot overlap.  */
          memcpy (ctx->buffer,
                  &((char *) ctx->buffer)[(left_over + add) & ~63],