Changeset 6496 for trunk/licq

Timestamp:

08/24/08 22:40:12 (3 months ago)

Author:

flynd

Message:

Don't use two 32 bit vars for a 64 bit counter. Compiler can handle this for 32 bit systems.

Location:

trunk/licq

Files:

• include/licq_md5.h (modified) (1 diff)
• src/md5.cpp (modified) (4 diffs)

trunk/licq/include/licq_md5.h

@@ -20 +20 @@
 {
   uint32_t buf[4];
-  uint32_t bytes[2];
+  uint64_t bytes;
   uint32_t in[16];
 };

trunk/licq/src/md5.cpp

@@ -54 +54 @@
     ctx->buf[2]     = 0x98badcfe;
     ctx->buf[3]     = 0x10325476;
-    ctx->bytes[0]   = 0;
-    ctx->bytes[1]   = 0;
+  ctx->bytes = 0;
 }
 
@@ -64 +63 @@
 void MD5Update(struct MD5Context* ctx, uint8_t const* buf, size_t len)
 {
+  /* Space available in ctx->in (at least 1) */
+  uint32_t t = 64 - (ctx->bytes & 0x3f);
+
   /* Update byte count */
-  uint32_t t = ctx->bytes[0];
-    if ((ctx->bytes[0] = t + len) < t)
-        ctx->bytes[1]++;    /* Carry from low to high */
-
-    t = 64 - (t & 0x3f);    /* Space available in ctx->in (at least 1) */
+  ctx->bytes += len;
+
     if (t > len) {
     memcpy((uint8_t*)ctx->in + 64 - t, buf, len);
@@ -100 +99 @@
 void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
 {
-    int     count = ctx->bytes[0] & 0x3f;   /* Number of bytes in ctx->in */
+  int count = ctx->bytes & 0x3f; /* Number of bytes in ctx->in */
   uint8_t* p = (uint8_t*)ctx->in + count;
 
@@ -120 +119 @@
 
     /* Append length in bits and transform */
-    ctx->in[14] = ctx->bytes[0] << 3;
-    ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
+  ctx->in[14] = ctx->bytes << 3;
+  ctx->in[15] = ctx->bytes >> 29;
     MD5Transform(ctx->buf, ctx->in);