Changeset 6495 for trunk/licq

Timestamp:

08/24/08 21:13:04 (3 months ago)

Author:

flynd

Message:

Use portable integer types from stdint.h instead of defining our own.

Location:

trunk/licq

Files:

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

trunk/licq/include/licq_md5.h

@@ -10 +10 @@
 #define MD5_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 #define MD5_DIGEST_LENGTH 16
 
-#define UINT8 unsigned char
-#define UINT32 unsigned int
+void md5(const uint8_t* buf, size_t len, uint8_t* digest);
 
-void md5(const UINT8* buf, unsigned int len, UINT8* digest);
-
-struct MD5Context {
-    UINT32 buf[4];
-    UINT32 bytes[2];
-    UINT32 in[16];
+struct MD5Context
+{
+  uint32_t buf[4];
+  uint32_t bytes[2];
+  uint32_t in[16];
 };
 
 void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, UINT8 const *buf, unsigned len);
+void MD5Update(struct MD5Context* context, uint8_t const* buf, size_t len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
-void MD5Transform(UINT32 buf[4], UINT32 const in[16]);
+void MD5Transform(uint32_t buf[4], const uint32_t in[16]);
 
-void byteSwap(UINT32 * buf, unsigned words);
+void byteSwap(uint32_t* buf, unsigned words);
 
 #endif              /* !MD5_H */

trunk/licq/src/md5.cpp

@@ -23 +23 @@
 #include "licq_md5.h"
 
-void md5(const UINT8* buf, unsigned int len, UINT8* digest)
+void md5(const uint8_t* buf, size_t len, uint8_t* digest)
 {
   MD5Context context;
@@ -35 +35 @@
  * Note: this code is harmless but does nothing on little-endian machines.
  */
-void byteSwap(UINT32 * buf, unsigned words)
-{
-    UINT8 *p = (UINT8 *) buf;
-
-    do {
-        *buf++ = (UINT32) ((unsigned) p[3] << 8 | p[2]) << 16 |
-            ((unsigned) p[1] << 8 | p[0]);
-        p += 4;
-    } while (--words);
+void byteSwap(uint32_t* buf, unsigned words)
+{
+  for ( ; words > 0; --words)
+  {
+    uint8_t* p = (uint8_t*)buf;
+    *buf++ = (uint32_t)p[3] << 24 | (uint32_t)p[2] << 16 | (uint32_t)p[1] << 8 | p[0];
+  }
 }
 
@@ -64 +62 @@
  * of bytes.
  */
-void MD5Update(struct MD5Context *ctx, UINT8 const *buf, unsigned len)
-{
-    UINT32 t;
-
-    /* Update byte count */
-
-    t = ctx->bytes[0];
+void MD5Update(struct MD5Context* ctx, uint8_t const* buf, size_t len)
+{
+  /* Update byte count */
+  uint32_t t = ctx->bytes[0];
     if ((ctx->bytes[0] = t + len) < t)
         ctx->bytes[1]++;    /* Carry from low to high */
@@ -76 +71 @@
     t = 64 - (t & 0x3f);    /* Space available in ctx->in (at least 1) */
     if (t > len) {
-        memcpy((UINT8 *) ctx->in + 64 - t, buf, len);
+    memcpy((uint8_t*)ctx->in + 64 - t, buf, len);
         return;
     }
     /* First chunk is an odd size */
-    memcpy((UINT8 *) ctx->in + 64 - t, buf, t);
+  memcpy((uint8_t*)ctx->in + 64 - t, buf, t);
     byteSwap(ctx->in, 16);
     MD5Transform(ctx->buf, ctx->in);
@@ -103 +98 @@
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
-void MD5Final(UINT8 digest[16], struct MD5Context *ctx)
+void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
 {
     int     count = ctx->bytes[0] & 0x3f;   /* Number of bytes in ctx->in */
-    UINT8   *p = (UINT8 *) ctx->in + count;
+  uint8_t* p = (uint8_t*)ctx->in + count;
 
     /* Set the first char of padding to 0x80.  There is always room. */
@@ -118 +113 @@
         byteSwap(ctx->in, 16);
         MD5Transform(ctx->buf, ctx->in);
-        p = (UINT8 *) ctx->in;
+    p = (uint8_t*)ctx->in;
         count = 56;
     }
@@ -153 +148 @@
  * the data and converts bytes into longwords for this routine.
  */
-void MD5Transform(UINT32 buf[4], UINT32 const in[16])
-{
-    register UINT32 a, b, c, d;
+void MD5Transform(uint32_t buf[4], const uint32_t in[16])
+{
+  register uint32_t a, b, c, d;
 
     a = buf[0];