--- a/src/xs_md5.c	Fri Jan 26 15:55:02 2007 +0000
+++ b/src/xs_md5.c	Fri Jan 26 16:36:01 2007 +0000
@@ -1,333 +1,228 @@
 /*
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
-
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321.
-  It is derived directly from the text of the RFC and not from the
-  reference implementation.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-08-25 ccr Edited for integration in XMMS-SID. Removed unnecessary stuff.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
+ * MD5 implementation, modified for XMMS-SID from
+ * Colin Plumb's implementation by Matti 'ccr' Hämäläinen.
+ *
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
  */
-/* Include config.h here, because we don't include xmms-sid.h */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
+#include "xs_support.h"
 #include "xs_md5.h"
-
-#define T1 0xd76aa478
-#define T2 0xe8c7b756
-#define T3 0x242070db
-#define T4 0xc1bdceee
-#define T5 0xf57c0faf
-#define T6 0x4787c62a
-#define T7 0xa8304613
-#define T8 0xfd469501
-#define T9 0x698098d8
-#define T10 0x8b44f7af
-#define T11 0xffff5bb1
-#define T12 0x895cd7be
-#define T13 0x6b901122
-#define T14 0xfd987193
-#define T15 0xa679438e
-#define T16 0x49b40821
-#define T17 0xf61e2562
-#define T18 0xc040b340
-#define T19 0x265e5a51
-#define T20 0xe9b6c7aa
-#define T21 0xd62f105d
-#define T22 0x02441453
-#define T23 0xd8a1e681
-#define T24 0xe7d3fbc8
-#define T25 0x21e1cde6
-#define T26 0xc33707d6
-#define T27 0xf4d50d87
-#define T28 0x455a14ed
-#define T29 0xa9e3e905
-#define T30 0xfcefa3f8
-#define T31 0x676f02d9
-#define T32 0x8d2a4c8a
-#define T33 0xfffa3942
-#define T34 0x8771f681
-#define T35 0x6d9d6122
-#define T36 0xfde5380c
-#define T37 0xa4beea44
-#define T38 0x4bdecfa9
-#define T39 0xf6bb4b60
-#define T40 0xbebfbc70
-#define T41 0x289b7ec6
-#define T42 0xeaa127fa
-#define T43 0xd4ef3085
-#define T44 0x04881d05
-#define T45 0xd9d4d039
-#define T46 0xe6db99e5
-#define T47 0x1fa27cf8
-#define T48 0xc4ac5665
-#define T49 0xf4292244
-#define T50 0x432aff97
-#define T51 0xab9423a7
-#define T52 0xfc93a039
-#define T53 0x655b59c3
-#define T54 0x8f0ccc92
-#define T55 0xffeff47d
-#define T56 0x85845dd1
-#define T57 0x6fa87e4f
-#define T58 0xfe2ce6e0
-#define T59 0xa3014314
-#define T60 0x4e0811a1
-#define T61 0xf7537e82
-#define T62 0xbd3af235
-#define T63 0x2ad7d2bb
-#define T64 0xeb86d391
+#include <glib.h>
 
 
-static void xs_md5_process(t_xs_md5state * pms, const guint8 * data)
+#ifndef WORDS_BIGENDIAN
+#define xs_md5_bytereverse(buf, len)	/* Nothing */
+#else
+void xs_md5_bytereverse(guint8 *buf, guint l)
 {
-	guint32 a = pms->abcd[0], b = pms->abcd[1], c = pms->abcd[2], d = pms->abcd[3];
 	guint32 t;
-	guint32 X[16];
-	const guint8 *xp = data;
-	gint i;
-
-	for (i = 0; i < 16; ++i, xp += 4)
-		X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	do {
+		t = (guint32) ((guint) buf[3] << 8 | buf[2]) << 16 | ((guint) buf[1] << 8 | buf[0]);
+		*(guint32 *) buf = t;
+		buf += sizeof(guint32);
+	} while (--l);
+}
+#endif
 
 
-	/*
-	 * Round 1. Let [abcd k s i] denote the operation
-	 * a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s).
-	 */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-
-	/* Do the following 16 operations. */
-	SET(a, b, c, d, 0, 7, T1);
-	SET(d, a, b, c, 1, 12, T2);
-	SET(c, d, a, b, 2, 17, T3);
-	SET(b, c, d, a, 3, 22, T4);
-	SET(a, b, c, d, 4, 7, T5);
-	SET(d, a, b, c, 5, 12, T6);
-	SET(c, d, a, b, 6, 17, T7);
-	SET(b, c, d, a, 7, 22, T8);
-	SET(a, b, c, d, 8, 7, T9);
-	SET(d, a, b, c, 9, 12, T10);
-	SET(c, d, a, b, 10, 17, T11);
-	SET(b, c, d, a, 11, 22, T12);
-	SET(a, b, c, d, 12, 7, T13);
-	SET(d, a, b, c, 13, 12, T14);
-	SET(c, d, a, b, 14, 17, T15);
-	SET(b, c, d, a, 15, 22, T16);
-
-#undef SET
-
-	/*
-	 * Round 2. Let [abcd k s i] denote the operation
-	 * a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s).
-	 */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-
-	/* Do the following 16 operations. */
-	SET(a, b, c, d, 1, 5, T17);
-	SET(d, a, b, c, 6, 9, T18);
-	SET(c, d, a, b, 11, 14, T19);
-	SET(b, c, d, a, 0, 20, T20);
-	SET(a, b, c, d, 5, 5, T21);
-	SET(d, a, b, c, 10, 9, T22);
-	SET(c, d, a, b, 15, 14, T23);
-	SET(b, c, d, a, 4, 20, T24);
-	SET(a, b, c, d, 9, 5, T25);
-	SET(d, a, b, c, 14, 9, T26);
-	SET(c, d, a, b, 3, 14, T27);
-	SET(b, c, d, a, 8, 20, T28);
-	SET(a, b, c, d, 13, 5, T29);
-	SET(d, a, b, c, 2, 9, T30);
-	SET(c, d, a, b, 7, 14, T31);
-	SET(b, c, d, a, 12, 20, T32);
-
-#undef SET
+/* Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void xs_md5_init(t_xs_md5state *ctx)
+{
+	ctx->buf[0] = 0x67452301;
+	ctx->buf[1] = 0xefcdab89;
+	ctx->buf[2] = 0x98badcfe;
+	ctx->buf[3] = 0x10325476;
 
-	/*
-	 * Round 3. Let [abcd k s t] denote the operation
-	 * a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s).
-	 */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-
-	/* Do the following 16 operations. */
-	SET(a, b, c, d, 5, 4, T33);
-	SET(d, a, b, c, 8, 11, T34);
-	SET(c, d, a, b, 11, 16, T35);
-	SET(b, c, d, a, 14, 23, T36);
-	SET(a, b, c, d, 1, 4, T37);
-	SET(d, a, b, c, 4, 11, T38);
-	SET(c, d, a, b, 7, 16, T39);
-	SET(b, c, d, a, 10, 23, T40);
-	SET(a, b, c, d, 13, 4, T41);
-	SET(d, a, b, c, 0, 11, T42);
-	SET(c, d, a, b, 3, 16, T43);
-	SET(b, c, d, a, 6, 23, T44);
-	SET(a, b, c, d, 9, 4, T45);
-	SET(d, a, b, c, 12, 11, T46);
-	SET(c, d, a, b, 15, 16, T47);
-	SET(b, c, d, a, 2, 23, T48);
-
-#undef SET
-
-	/*
-	 * Round 4. Let [abcd k s t] denote the operation
-	 * a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s).
-	 */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-
-	/* Do the following 16 operations. */
-	SET(a, b, c, d, 0, 6, T49);
-	SET(d, a, b, c, 7, 10, T50);
-	SET(c, d, a, b, 14, 15, T51);
-	SET(b, c, d, a, 5, 21, T52);
-	SET(a, b, c, d, 12, 6, T53);
-	SET(d, a, b, c, 3, 10, T54);
-	SET(c, d, a, b, 10, 15, T55);
-	SET(b, c, d, a, 1, 21, T56);
-	SET(a, b, c, d, 8, 6, T57);
-	SET(d, a, b, c, 15, 10, T58);
-	SET(c, d, a, b, 6, 15, T59);
-	SET(b, c, d, a, 13, 21, T60);
-	SET(a, b, c, d, 4, 6, T61);
-	SET(d, a, b, c, 11, 10, T62);
-	SET(c, d, a, b, 2, 15, T63);
-	SET(b, c, d, a, 9, 21, T64);
-
-#undef SET
-
-	/*
-	 * Then perform the following additions. (That is increment each
-	 * of the four registers by the value it had before this block was started.)
-	 */
-	pms->abcd[0] += a;
-	pms->abcd[1] += b;
-	pms->abcd[2] += c;
-	pms->abcd[3] += d;
+	ctx->bits[0] = 0;
+	ctx->bits[1] = 0;
 }
 
 
-void xs_md5_init(t_xs_md5state * pms)
+/* The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  xs_md5_update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+#define MD5STEP(f, w, x, y, z, data, s) \
+	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+void xs_md5_transform(guint32 buf[4], guint32 const in[16])
 {
-	pms->count[0] = pms->count[1] = 0;
-	pms->abcd[0] = 0x67452301;
-	pms->abcd[1] = 0xefcdab89;
-	pms->abcd[2] = 0x98badcfe;
-	pms->abcd[3] = 0x10325476;
+	register guint32 a, b, c, d;
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
 }
 
 
-void xs_md5_append(t_xs_md5state * pms, const guint8 * data, int nbytes)
+/* Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void xs_md5_append(t_xs_md5state *ctx, const guint8 *buf, guint len)
 {
-	const guint8 *p = data;
-	gint left = nbytes;
-	gint offset = (pms->count[0] >> 3) & 63;
-	guint32 nbits = (guint32) (nbytes << 3);
+	guint32 t;
 
-	if (nbytes <= 0)
-		return;
+	/* Update bitcount */
+	t = ctx->bits[0];
+	if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
+		ctx->bits[1]++;	/* Carry from low to high */
+	ctx->bits[1] += len >> 29;
+
+	t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
+
+	/* Handle any leading odd-sized chunks */
+
+	if (t) {
+		guint8 *p = (guint8 *) ctx->in + t;
 
-	/* Update the message length. */
-	pms->count[1] += nbytes >> 29;
-	pms->count[0] += nbits;
-	if (pms->count[0] < nbits)
-		pms->count[1]++;
+		t = 64 - t;
+		if (len < t) {
+			memcpy(p, buf, len);
+			return;
+		}
+		memcpy(p, buf, t);
+		xs_md5_bytereverse(ctx->in, 16);
+		xs_md5_transform(ctx->buf, (guint32 *) ctx->in);
+		buf += t;
+		len -= t;
+	}
+	/* Process data in 64-byte chunks */
 
-	/* Process an initial partial block. */
-	if (offset) {
-		int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-		memcpy(pms->buf + offset, p, copy);
-
-		if (offset + copy < 64)
-			return;
-
-		p += copy;
-		left -= copy;
-		xs_md5_process(pms, pms->buf);
+	while (len >= 64) {
+		memcpy(ctx->in, buf, 64);
+		xs_md5_bytereverse(ctx->in, 16);
+		xs_md5_transform(ctx->buf, (guint32 *) ctx->in);
+		buf += 64;
+		len -= 64;
 	}
 
-	/* Process full blocks. */
-	for (; left >= 64; p += 64, left -= 64)
-		xs_md5_process(pms, p);
+	/* Handle any remaining bytes of data. */
 
-	/* Process a final partial block. */
-	if (left)
-		memcpy(pms->buf, p, left);
+	memcpy(ctx->in, buf, len);
 }
 
-
-void xs_md5_finish(t_xs_md5state * pms, t_xs_md5hash digest)
+/* Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void xs_md5_finish(t_xs_md5state *ctx, t_xs_md5hash digest)
 {
-	static const guint8 pad[64] = {
-		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	};
+	guint count;
+	guint8 *p;
+
+	/* Compute number of bytes mod 64 */
+	count = (ctx->bits[0] >> 3) & 0x3F;
 
-	guint8 data[8];
-	gint i;
+	/* Set the first char of padding to 0x80.  This is safe since there is
+	   always at least one byte free */
+	p = ctx->in + count;
+	*p++ = 0x80;
+
+	/* Bytes of padding needed to make 64 bytes */
+	count = 64 - 1 - count;
 
-	/* Save the length before padding. */
-	for (i = 0; i < 8; ++i)
-		data[i] = (guint8) (pms->count[i >> 2] >> ((i & 3) << 3));
+	/* Pad out to 56 mod 64 */
+	if (count < 8) {
+		/* Two lots of padding:  Pad the first block to 64 bytes */
+		xs_memset(p, 0, count);
+		xs_md5_bytereverse(ctx->in, 16);
+		xs_md5_transform(ctx->buf, (guint32 *) ctx->in);
 
-	/* Pad to 56 bytes mod 64. */
-	xs_md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+		/* Now fill the next block with 56 bytes */
+		xs_memset(ctx->in, 0, 56);
+	} else {
+		/* Pad block to 56 bytes */
+		xs_memset(p, 0, count - 8);
+	}
+	xs_md5_bytereverse(ctx->in, 14);
 
-	/* Append the length. */
-	xs_md5_append(pms, data, 8);
-	for (i = 0; i < XS_MD5HASH_LENGTH; ++i)
-		digest[i] = (guint8) (pms->abcd[i >> 2] >> ((i & 3) << 3));
+	/* Append length in bits and transform */
+	((guint32 *) ctx->in)[14] = ctx->bits[0];
+	((guint32 *) ctx->in)[15] = ctx->bits[1];
+
+	xs_md5_transform(ctx->buf, (guint32 *) ctx->in);
+	xs_md5_bytereverse((guint8 *) ctx->buf, 4);
+	memcpy(digest, ctx->buf, 16);
+	xs_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
 }

--- a/src/xs_md5.h	Fri Jan 26 15:55:02 2007 +0000
+++ b/src/xs_md5.h	Fri Jan 26 16:36:01 2007 +0000
@@ -7,13 +7,12 @@
 extern "C" {
 #endif
 
-/*
- * Typedefs
+/* Typedefs
  */
 typedef struct md5_state_s {
-	guint32 count[2];	/* message length in bits, lsw first */
-	guint32 abcd[4];	/* digest buffer */
-	guint8 buf[64];		/* accumulate block */
+	guint32 bits[2];	/* message length in bits, lsw first */
+	guint32 buf[4];		/* digest buffer */
+	guint8 in[64];		/* accumulate block */
 } t_xs_md5state;
 
 #define XS_MD5HASH_LENGTH	(16)
@@ -22,12 +21,11 @@
 typedef guint8 t_xs_md5hash[XS_MD5HASH_LENGTH];
 
 
-/*
- * Functions
+/* Functions
  */
-void xs_md5_init(t_xs_md5state *pms);
-void xs_md5_append(t_xs_md5state *pms, const guint8 *data, int nbytes);
-void xs_md5_finish(t_xs_md5state *pms, t_xs_md5hash digest);
+void xs_md5_init(t_xs_md5state *ctx);
+void xs_md5_append(t_xs_md5state *ctx, const guint8 *buf, guint len);
+void xs_md5_finish(t_xs_md5state *ctx, t_xs_md5hash digest);
 
 
 #ifdef __cplusplus