X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmd4.c;h=e5f5d54879e84a655ba4624c2f6585b9f9ada336;hb=e1eaf8c33fd7766151be961232f244b1ae07b91d;hp=fcade301ed640b099b5e4eb4a284fa0cc660af54;hpb=d114b0a2d9c7049f57a54966bd118e4a70d1bc1e;p=gnulib.git

diff --git a/lib/md4.c b/lib/md4.c
index fcade301e..e5f5d5487 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -49,7 +49,7 @@
 
 /* This array contains the bytes used to pad the buffer to the next
    64-byte boundary.  (RFC 1320, 3.1: Step 1)  */
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */  };
 
 
 /* Initialize structure containing state of computation.
@@ -100,12 +100,12 @@ md4_finish_ctx (struct md4_ctx *ctx, void *resbuf)
     ++ctx->total[1];
 
   pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
-  memcpy (&ctx->buffer[bytes], fillbuf, pad);
+  memcpy (&((char*)ctx->buffer)[bytes], fillbuf, pad);
 
   /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-  *(uint32_t *) & ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-  *(uint32_t *) & ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
-						       (ctx->total[0] >> 29));
+  ctx->buffer[(bytes + pad) / 4] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[(bytes + pad) / 4 + 1] = SWAP ((ctx->total[1] << 3) |
+					     (ctx->total[0] >> 29));
 
   /* Process last bytes.  */
   md4_process_block (ctx->buffer, bytes + pad + 8, ctx);
@@ -208,7 +208,7 @@ md4_process_bytes (const void *buffer, size_t len, struct md4_ctx *ctx)
       size_t left_over = ctx->buflen;
       size_t add = 128 - left_over > len ? len : 128 - left_over;
 
-      memcpy (&ctx->buffer[left_over], buffer, add);
+      memcpy (&((char*)ctx->buffer)[left_over], buffer, add);
       ctx->buflen += add;
 
       if (ctx->buflen > 64)
@@ -217,7 +217,7 @@ md4_process_bytes (const void *buffer, size_t len, struct md4_ctx *ctx)
 
 	  ctx->buflen &= 63;
 	  /* The regions in the following copy operation cannot overlap.  */
-	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
+	  memcpy (ctx->buffer, &((char*)ctx->buffer)[(left_over + add) & ~63],
 		  ctx->buflen);
 	}
 
@@ -258,13 +258,13 @@ md4_process_bytes (const void *buffer, size_t len, struct md4_ctx *ctx)
     {
       size_t left_over = ctx->buflen;
 
-      memcpy (&ctx->buffer[left_over], buffer, len);
+      memcpy (&((char*)ctx->buffer)[left_over], buffer, len);
       left_over += len;
       if (left_over >= 64)
 	{
 	  md4_process_block (ctx->buffer, 64, ctx);
 	  left_over -= 64;
-	  memcpy (ctx->buffer, &ctx->buffer[64], left_over);
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
 	}
       ctx->buflen = left_over;
     }