12 files changed, 1975 insertions, 169 deletions

diff --git a/misc/rfc1321-md5.txt b/misc/rfc1321-md5.txt
new file mode 100644
index 0000000..68af27d
--- /dev/null
+++ b/misc/rfc1321-md5.txt
@@ -0,0 +1,1179 @@
+
+
+
+
+
+
+Network Working Group                                          R. Rivest
+Request for Comments: 1321           MIT Laboratory for Computer Science
+                                             and RSA Data Security, Inc.
+                                                              April 1992
+
+
+                     The MD5 Message-Digest Algorithm
+
+Status of this Memo
+
+   This memo provides information for the Internet community.  It does
+   not specify an Internet standard.  Distribution of this memo is
+   unlimited.
+
+Acknowlegements
+
+   We would like to thank Don Coppersmith, Burt Kaliski, Ralph Merkle,
+   David Chaum, and Noam Nisan for numerous helpful comments and
+   suggestions.
+
+Table of Contents
+
+   1. Executive Summary                                                1
+   2. Terminology and Notation                                         2
+   3. MD5 Algorithm Description                                        3
+   4. Summary                                                          6
+   5. Differences Between MD4 and MD5                                  6
+   References                                                          7
+   APPENDIX A - Reference Implementation                               7
+   Security Considerations                                            21
+   Author's Address                                                   21
+
+1. Executive Summary
+
+   This document describes the MD5 message-digest algorithm. The
+   algorithm takes as input a message of arbitrary length and produces
+   as output a 128-bit "fingerprint" or "message digest" of the input.
+   It is conjectured that it is computationally infeasible to produce
+   two messages having the same message digest, or to produce any
+   message having a given prespecified target message digest. The MD5
+   algorithm is intended for digital signature applications, where a
+   large file must be "compressed" in a secure manner before being
+   encrypted with a private (secret) key under a public-key cryptosystem
+   such as RSA.
+
+
+
+
+
+
+
+Rivest                                                          [Page 1]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+   The MD5 algorithm is designed to be quite fast on 32-bit machines. In
+   addition, the MD5 algorithm does not require any large substitution
+   tables; the algorithm can be coded quite compactly.
+
+   The MD5 algorithm is an extension of the MD4 message-digest algorithm
+   1,2]. MD5 is slightly slower than MD4, but is more "conservative" in
+   design. MD5 was designed because it was felt that MD4 was perhaps
+   being adopted for use more quickly than justified by the existing
+   critical review; because MD4 was designed to be exceptionally fast,
+   it is "at the edge" in terms of risking successful cryptanalytic
+   attack. MD5 backs off a bit, giving up a little in speed for a much
+   greater likelihood of ultimate security. It incorporates some
+   suggestions made by various reviewers, and contains additional
+   optimizations. The MD5 algorithm is being placed in the public domain
+   for review and possible adoption as a standard.
+
+   For OSI-based applications, MD5's object identifier is
+
+   md5 OBJECT IDENTIFIER ::=
+     iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 5}
+
+   In the X.509 type AlgorithmIdentifier [3], the parameters for MD5
+   should have type NULL.
+
+2. Terminology and Notation
+
+   In this document a "word" is a 32-bit quantity and a "byte" is an
+   eight-bit quantity. A sequence of bits can be interpreted in a
+   natural manner as a sequence of bytes, where each consecutive group
+   of eight bits is interpreted as a byte with the high-order (most
+   significant) bit of each byte listed first. Similarly, a sequence of
+   bytes can be interpreted as a sequence of 32-bit words, where each
+   consecutive group of four bytes is interpreted as a word with the
+   low-order (least significant) byte given first.
+
+   Let x_i denote "x sub i". If the subscript is an expression, we
+   surround it in braces, as in x_{i+1}. Similarly, we use ^ for
+   superscripts (exponentiation), so that x^i denotes x to the i-th
+   power.
+
+   Let the symbol "+" denote addition of words (i.e., modulo-2^32
+   addition). Let X <<< s denote the 32-bit value obtained by circularly
+   shifting (rotating) X left by s bit positions. Let not(X) denote the
+   bit-wise complement of X, and let X v Y denote the bit-wise OR of X
+   and Y. Let X xor Y denote the bit-wise XOR of X and Y, and let XY
+   denote the bit-wise AND of X and Y.
+
+
+
+
+
+Rivest                                                          [Page 2]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+3. MD5 Algorithm Description
+
+   We begin by supposing that we have a b-bit message as input, and that
+   we wish to find its message digest. Here b is an arbitrary
+   nonnegative integer; b may be zero, it need not be a multiple of
+   eight, and it may be arbitrarily large. We imagine the bits of the
+   message written down as follows:
+
+          m_0 m_1 ... m_{b-1}
+
+   The following five steps are performed to compute the message digest
+   of the message.
+
+3.1 Step 1. Append Padding Bits
+
+   The message is "padded" (extended) so that its length (in bits) is
+   congruent to 448, modulo 512. That is, the message is extended so
+   that it is just 64 bits shy of being a multiple of 512 bits long.
+   Padding is always performed, even if the length of the message is
+   already congruent to 448, modulo 512.
+
+   Padding is performed as follows: a single "1" bit is appended to the
+   message, and then "0" bits are appended so that the length in bits of
+   the padded message becomes congruent to 448, modulo 512. In all, at
+   least one bit and at most 512 bits are appended.
+
+3.2 Step 2. Append Length
+
+   A 64-bit representation of b (the length of the message before the
+   padding bits were added) is appended to the result of the previous
+   step. In the unlikely event that b is greater than 2^64, then only
+   the low-order 64 bits of b are used. (These bits are appended as two
+   32-bit words and appended low-order word first in accordance with the
+   previous conventions.)
+
+   At this point the resulting message (after padding with bits and with
+   b) has a length that is an exact multiple of 512 bits. Equivalently,
+   this message has a length that is an exact multiple of 16 (32-bit)
+   words. Let M[0 ... N-1] denote the words of the resulting message,
+   where N is a multiple of 16.
+
+3.3 Step 3. Initialize MD Buffer
+
+   A four-word buffer (A,B,C,D) is used to compute the message digest.
+   Here each of A, B, C, D is a 32-bit register. These registers are
+   initialized to the following values in hexadecimal, low-order bytes
+   first):
+
+
+
+
+Rivest                                                          [Page 3]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+          word A: 01 23 45 67
+          word B: 89 ab cd ef
+          word C: fe dc ba 98
+          word D: 76 54 32 10
+
+3.4 Step 4. Process Message in 16-Word Blocks
+
+   We first define four auxiliary functions that each take as input
+   three 32-bit words and produce as output one 32-bit word.
+
+          F(X,Y,Z) = XY v not(X) Z
+          G(X,Y,Z) = XZ v Y not(Z)
+          H(X,Y,Z) = X xor Y xor Z
+          I(X,Y,Z) = Y xor (X v not(Z))
+
+   In each bit position F acts as a conditional: if X then Y else Z.
+   The function F could have been defined using + instead of v since XY
+   and not(X)Z will never have 1's in the same bit position.) It is
+   interesting to note that if the bits of X, Y, and Z are independent
+   and unbiased, the each bit of F(X,Y,Z) will be independent and
+   unbiased.
+
+   The functions G, H, and I are similar to the function F, in that they
+   act in "bitwise parallel" to produce their output from the bits of X,
+   Y, and Z, in such a manner that if the corresponding bits of X, Y,
+   and Z are independent and unbiased, then each bit of G(X,Y,Z),
+   H(X,Y,Z), and I(X,Y,Z) will be independent and unbiased. Note that
+   the function H is the bit-wise "xor" or "parity" function of its
+   inputs.
+
+   This step uses a 64-element table T[1 ... 64] constructed from the
+   sine function. Let T[i] denote the i-th element of the table, which
+   is equal to the integer part of 4294967296 times abs(sin(i)), where i
+   is in radians. The elements of the table are given in the appendix.
+
+   Do the following:
+
+   /* Process each 16-word block. */
+   For i = 0 to N/16-1 do
+
+     /* Copy block i into X. */
+     For j = 0 to 15 do
+       Set X[j] to M[i*16+j].
+     end /* of loop on j */
+
+     /* Save A as AA, B as BB, C as CC, and D as DD. */
+     AA = A
+     BB = B
+
+
+
+Rivest                                                          [Page 4]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+     CC = C
+     DD = D
+
+     /* Round 1. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+     /* Do the following 16 operations. */
+     [ABCD  0  7  1]  [DABC  1 12  2]  [CDAB  2 17  3]  [BCDA  3 22  4]
+     [ABCD  4  7  5]  [DABC  5 12  6]  [CDAB  6 17  7]  [BCDA  7 22  8]
+     [ABCD  8  7  9]  [DABC  9 12 10]  [CDAB 10 17 11]  [BCDA 11 22 12]
+     [ABCD 12  7 13]  [DABC 13 12 14]  [CDAB 14 17 15]  [BCDA 15 22 16]
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+     /* Do the following 16 operations. */
+     [ABCD  1  5 17]  [DABC  6  9 18]  [CDAB 11 14 19]  [BCDA  0 20 20]
+     [ABCD  5  5 21]  [DABC 10  9 22]  [CDAB 15 14 23]  [BCDA  4 20 24]
+     [ABCD  9  5 25]  [DABC 14  9 26]  [CDAB  3 14 27]  [BCDA  8 20 28]
+     [ABCD 13  5 29]  [DABC  2  9 30]  [CDAB  7 14 31]  [BCDA 12 20 32]
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+     /* Do the following 16 operations. */
+     [ABCD  5  4 33]  [DABC  8 11 34]  [CDAB 11 16 35]  [BCDA 14 23 36]
+     [ABCD  1  4 37]  [DABC  4 11 38]  [CDAB  7 16 39]  [BCDA 10 23 40]
+     [ABCD 13  4 41]  [DABC  0 11 42]  [CDAB  3 16 43]  [BCDA  6 23 44]
+     [ABCD  9  4 45]  [DABC 12 11 46]  [CDAB 15 16 47]  [BCDA  2 23 48]
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+     /* Do the following 16 operations. */
+     [ABCD  0  6 49]  [DABC  7 10 50]  [CDAB 14 15 51]  [BCDA  5 21 52]
+     [ABCD 12  6 53]  [DABC  3 10 54]  [CDAB 10 15 55]  [BCDA  1 21 56]
+     [ABCD  8  6 57]  [DABC 15 10 58]  [CDAB  6 15 59]  [BCDA 13 21 60]
+     [ABCD  4  6 61]  [DABC 11 10 62]  [CDAB  2 15 63]  [BCDA  9 21 64]
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+     A = A + AA
+     B = B + BB
+     C = C + CC
+     D = D + DD
+
+   end /* of loop on i */
+
+
+
+Rivest                                                          [Page 5]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+3.5 Step 5. Output
+
+   The message digest produced as output is A, B, C, D. That is, we
+   begin with the low-order byte of A, and end with the high-order byte
+   of D.
+
+   This completes the description of MD5. A reference implementation in
+   C is given in the appendix.
+
+4. Summary
+
+   The MD5 message-digest algorithm is simple to implement, and provides
+   a "fingerprint" or message digest of a message of arbitrary length.
+   It is conjectured that the difficulty of coming up with two messages
+   having the same message digest is on the order of 2^64 operations,
+   and that the difficulty of coming up with any message having a given
+   message digest is on the order of 2^128 operations. The MD5 algorithm
+   has been carefully scrutinized for weaknesses. It is, however, a
+   relatively new algorithm and further security analysis is of course
+   justified, as is the case with any new proposal of this sort.
+
+5. Differences Between MD4 and MD5
+
+     The following are the differences between MD4 and MD5:
+
+       1.   A fourth round has been added.
+
+       2.   Each step now has a unique additive constant.
+
+       3.   The function g in round 2 was changed from (XY v XZ v YZ) to
+       (XZ v Y not(Z)) to make g less symmetric.
+
+       4.   Each step now adds in the result of the previous step.  This
+       promotes a faster "avalanche effect".
+
+       5.   The order in which input words are accessed in rounds 2 and
+       3 is changed, to make these patterns less like each other.
+
+       6.   The shift amounts in each round have been approximately
+       optimized, to yield a faster "avalanche effect." The shifts in
+       different rounds are distinct.
+
+
+
+
+
+
+
+
+
+
+Rivest                                                          [Page 6]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+References
+
+   [1] Rivest, R., "The MD4 Message Digest Algorithm", RFC 1320, MIT and
+       RSA Data Security, Inc., April 1992.
+
+   [2] Rivest, R., "The MD4 message digest algorithm", in A.J.  Menezes
+       and S.A. Vanstone, editors, Advances in Cryptology - CRYPTO '90
+       Proceedings, pages 303-311, Springer-Verlag, 1991.
+
+   [3] CCITT Recommendation X.509 (1988), "The Directory -
+       Authentication Framework."
+
+APPENDIX A - Reference Implementation
+
+   This appendix contains the following files taken from RSAREF: A
+   Cryptographic Toolkit for Privacy-Enhanced Mail:
+
+     global.h -- global header file
+
+     md5.h -- header file for MD5
+
+     md5c.c -- source code for MD5
+
+   For more information on RSAREF, send email to <rsaref@rsa.com>.
+
+   The appendix also includes the following file:
+
+     mddriver.c -- test driver for MD2, MD4 and MD5
+
+   The driver compiles for MD5 by default but can compile for MD2 or MD4
+   if the symbol MD is defined on the C compiler command line as 2 or 4.
+
+   The implementation is portable and should work on many different
+   plaforms. However, it is not difficult to optimize the implementation
+   on particular platforms, an exercise left to the reader. For example,
+   on "little-endian" platforms where the lowest-addressed byte in a 32-
+   bit word is the least significant and there are no alignment
+   restrictions, the call to Decode in MD5Transform can be replaced with
+   a typecast.
+
+A.1 global.h
+
+/* GLOBAL.H - RSAREF types and constants
+ */
+
+/* PROTOTYPES should be set to one if and only if the compiler supports
+  function argument prototyping.
+The following makes PROTOTYPES default to 0 if it has not already
+
+
+
+Rivest                                                          [Page 7]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+  been defined with C compiler flags.
+ */
+#ifndef PROTOTYPES
+#define PROTOTYPES 0
+#endif
+
+/* POINTER defines a generic pointer type */
+typedef unsigned char *POINTER;
+
+/* UINT2 defines a two byte word */
+typedef unsigned short int UINT2;
+
+/* UINT4 defines a four byte word */
+typedef unsigned long int UINT4;
+
+/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+  returns an empty list.
+ */
+#if PROTOTYPES
+#define PROTO_LIST(list) list
+#else
+#define PROTO_LIST(list) ()
+#endif
+
+A.2 md5.h
+
+/* MD5.H - header file for MD5C.C
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+
+
+
+Rivest                                                          [Page 8]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+/* MD5 context. */
+typedef struct {
+  UINT4 state[4];                                   /* state (ABCD) */
+  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];                         /* input buffer */
+} MD5_CTX;
+
+void MD5Init PROTO_LIST ((MD5_CTX *));
+void MD5Update PROTO_LIST
+  ((MD5_CTX *, unsigned char *, unsigned int));
+void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
+
+A.3 md5c.c
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+#include "global.h"
+#include "md5.h"
+
+/* Constants for MD5Transform routine.
+ */
+
+
+
+Rivest                                                          [Page 9]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
+static void Encode PROTO_LIST
+  ((unsigned char *, UINT4 *, unsigned int));
+static void Decode PROTO_LIST
+  ((UINT4 *, unsigned char *, unsigned int));
+static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
+static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
+
+static unsigned char PADDING[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
+};
+
+/* F, G, H and I are basic MD5 functions.
+ */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+ */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+ */
+#define FF(a, b, c, d, x, s, ac) { \
+ (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+
+
+
+Rivest                                                         [Page 10]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+ (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) { \
+ (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) { \
+ (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) { \
+ (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context.
+ */
+void MD5Init (context)
+MD5_CTX *context;                                        /* context */
+{
+  context->count[0] = context->count[1] = 0;
+  /* Load magic initialization constants.
+*/
+  context->state[0] = 0x67452301;
+  context->state[1] = 0xefcdab89;
+  context->state[2] = 0x98badcfe;
+  context->state[3] = 0x10325476;
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+  operation, processing another message block, and updating the
+  context.
+ */
+void MD5Update (context, input, inputLen)
+MD5_CTX *context;                                        /* context */
+unsigned char *input;                                /* input block */
+unsigned int inputLen;                     /* length of input block */
+{
+  unsigned int i, index, partLen;
+
+  /* Compute number of bytes mod 64 */
+  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+
+  /* Update number of bits */
+  if ((context->count[0] += ((UINT4)inputLen << 3))
+
+
+
+Rivest                                                         [Page 11]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+   < ((UINT4)inputLen << 3))
+ context->count[1]++;
+  context->count[1] += ((UINT4)inputLen >> 29);
+
+  partLen = 64 - index;
+
+  /* Transform as many times as possible.
+*/
+  if (inputLen >= partLen) {
+ MD5_memcpy
+   ((POINTER)&context->buffer[index], (POINTER)input, partLen);
+ MD5Transform (context->state, context->buffer);
+
+ for (i = partLen; i + 63 < inputLen; i += 64)
+   MD5Transform (context->state, &input[i]);
+
+ index = 0;
+  }
+  else
+ i = 0;
+
+  /* Buffer remaining input */
+  MD5_memcpy
+ ((POINTER)&context->buffer[index], (POINTER)&input[i],
+  inputLen-i);
+}
+
+/* MD5 finalization. Ends an MD5 message-digest operation, writing the
+  the message digest and zeroizing the context.
+ */
+void MD5Final (digest, context)
+unsigned char digest[16];                         /* message digest */
+MD5_CTX *context;                                       /* context */
+{
+  unsigned char bits[8];
+  unsigned int index, padLen;
+
+  /* Save number of bits */
+  Encode (bits, context->count, 8);
+
+  /* Pad out to 56 mod 64.
+*/
+  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+  padLen = (index < 56) ? (56 - index) : (120 - index);
+  MD5Update (context, PADDING, padLen);
+
+  /* Append length (before padding) */
+  MD5Update (context, bits, 8);
+
+
+
+Rivest                                                         [Page 12]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+  /* Store state in digest */
+  Encode (digest, context->state, 16);
+
+  /* Zeroize sensitive information.
+*/
+  MD5_memset ((POINTER)context, 0, sizeof (*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block.
+ */
+static void MD5Transform (state, block)
+UINT4 state[4];
+unsigned char block[64];
+{
+  UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+  Decode (x, block, 64);
+
+  /* Round 1 */
+  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+ /* Round 2 */
+  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+
+
+
+Rivest                                                         [Page 13]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+  /* Round 3 */
+  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+  /* Round 4 */
+  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+
+  /* Zeroize sensitive information.
+
+
+
+Rivest                                                         [Page 14]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+*/
+  MD5_memset ((POINTER)x, 0, sizeof (x));
+}
+
+/* Encodes input (UINT4) into output (unsigned char). Assumes len is
+  a multiple of 4.
+ */
+static void Encode (output, input, len)
+unsigned char *output;
+UINT4 *input;
+unsigned int len;
+{
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4) {
+ output[j] = (unsigned char)(input[i] & 0xff);
+ output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+ output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+ output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+  }
+}
+
+/* Decodes input (unsigned char) into output (UINT4). Assumes len is
+  a multiple of 4.
+ */
+static void Decode (output, input, len)
+UINT4 *output;
+unsigned char *input;
+unsigned int len;
+{
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4)
+ output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
+   (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
+}
+
+/* Note: Replace "for loop" with standard memcpy if possible.
+ */
+
+static void MD5_memcpy (output, input, len)
+POINTER output;
+POINTER input;
+unsigned int len;
+{
+  unsigned int i;
+
+  for (i = 0; i < len; i++)
+
+
+
+Rivest                                                         [Page 15]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+ output[i] = input[i];
+}
+
+/* Note: Replace "for loop" with standard memset if possible.
+ */
+static void MD5_memset (output, value, len)
+POINTER output;
+int value;
+unsigned int len;
+{
+  unsigned int i;
+
+  for (i = 0; i < len; i++)
+ ((char *)output)[i] = (char)value;
+}
+
+A.4 mddriver.c
+
+/* MDDRIVER.C - test driver for MD2, MD4 and MD5
+ */
+
+/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+rights reserved.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+/* The following makes MD default to MD5 if it has not already been
+  defined with C compiler flags.
+ */
+#ifndef MD
+#define MD MD5
+#endif
+
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include "global.h"
+#if MD == 2
+#include "md2.h"
+#endif
+#if MD == 4
+
+
+
+Rivest                                                         [Page 16]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+#include "md4.h"
+#endif
+#if MD == 5
+#include "md5.h"
+#endif
+
+/* Length of test block, number of test blocks.
+ */
+#define TEST_BLOCK_LEN 1000
+#define TEST_BLOCK_COUNT 1000
+
+static void MDString PROTO_LIST ((char *));
+static void MDTimeTrial PROTO_LIST ((void));
+static void MDTestSuite PROTO_LIST ((void));
+static void MDFile PROTO_LIST ((char *));
+static void MDFilter PROTO_LIST ((void));
+static void MDPrint PROTO_LIST ((unsigned char [16]));
+
+#if MD == 2
+#define MD_CTX MD2_CTX
+#define MDInit MD2Init
+#define MDUpdate MD2Update
+#define MDFinal MD2Final
+#endif
+#if MD == 4
+#define MD_CTX MD4_CTX
+#define MDInit MD4Init
+#define MDUpdate MD4Update
+#define MDFinal MD4Final
+#endif
+#if MD == 5
+#define MD_CTX MD5_CTX
+#define MDInit MD5Init
+#define MDUpdate MD5Update
+#define MDFinal MD5Final
+#endif
+
+/* Main driver.
+
+Arguments (may be any combination):
+  -sstring - digests string
+  -t       - runs time trial
+  -x       - runs test script
+  filename - digests file
+  (none)   - digests standard input
+ */
+int main (argc, argv)
+int argc;
+
+
+
+Rivest                                                         [Page 17]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+char *argv[];
+{
+  int i;
+
+  if (argc > 1)
+ for (i = 1; i < argc; i++)
+   if (argv[i][0] == '-' && argv[i][1] == 's')
+     MDString (argv[i] + 2);
+   else if (strcmp (argv[i], "-t") == 0)
+     MDTimeTrial ();
+   else if (strcmp (argv[i], "-x") == 0)
+     MDTestSuite ();
+   else
+     MDFile (argv[i]);
+  else
+ MDFilter ();
+
+  return (0);
+}
+
+/* Digests a string and prints the result.
+ */
+static void MDString (string)
+char *string;
+{
+  MD_CTX context;
+  unsigned char digest[16];
+  unsigned int len = strlen (string);
+
+  MDInit (&context);
+  MDUpdate (&context, string, len);
+  MDFinal (digest, &context);
+
+  printf ("MD%d (\"%s\") = ", MD, string);
+  MDPrint (digest);
+  printf ("\n");
+}
+
+/* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte
+  blocks.
+ */
+static void MDTimeTrial ()
+{
+  MD_CTX context;
+  time_t endTime, startTime;
+  unsigned char block[TEST_BLOCK_LEN], digest[16];
+  unsigned int i;
+
+
+
+
+Rivest                                                         [Page 18]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+  printf
+ ("MD%d time trial. Digesting %d %d-byte blocks ...", MD,
+  TEST_BLOCK_LEN, TEST_BLOCK_COUNT);
+
+  /* Initialize block */
+  for (i = 0; i < TEST_BLOCK_LEN; i++)
+ block[i] = (unsigned char)(i & 0xff);
+
+  /* Start timer */
+  time (&startTime);
+
+  /* Digest blocks */
+  MDInit (&context);
+  for (i = 0; i < TEST_BLOCK_COUNT; i++)
+ MDUpdate (&context, block, TEST_BLOCK_LEN);
+  MDFinal (digest, &context);
+
+  /* Stop timer */
+  time (&endTime);
+
+  printf (" done\n");
+  printf ("Digest = ");
+  MDPrint (digest);
+  printf ("\nTime = %ld seconds\n", (long)(endTime-startTime));
+  printf
+ ("Speed = %ld bytes/second\n",
+  (long)TEST_BLOCK_LEN * (long)TEST_BLOCK_COUNT/(endTime-startTime));
+}
+
+/* Digests a reference suite of strings and prints the results.
+ */
+static void MDTestSuite ()
+{
+  printf ("MD%d test suite:\n", MD);
+
+  MDString ("");
+  MDString ("a");
+  MDString ("abc");
+  MDString ("message digest");
+  MDString ("abcdefghijklmnopqrstuvwxyz");
+  MDString
+ ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+  MDString
+ ("1234567890123456789012345678901234567890\
+1234567890123456789012345678901234567890");
+}
+
+/* Digests a file and prints the result.
+
+
+
+Rivest                                                         [Page 19]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+ */
+static void MDFile (filename)
+char *filename;
+{
+  FILE *file;
+  MD_CTX context;
+  int len;
+  unsigned char buffer[1024], digest[16];
+
+  if ((file = fopen (filename, "rb")) == NULL)
+ printf ("%s can't be opened\n", filename);
+
+  else {
+ MDInit (&context);
+ while (len = fread (buffer, 1, 1024, file))
+   MDUpdate (&context, buffer, len);
+ MDFinal (digest, &context);
+
+ fclose (file);
+
+ printf ("MD%d (%s) = ", MD, filename);
+ MDPrint (digest);
+ printf ("\n");
+  }
+}
+
+/* Digests the standard input and prints the result.
+ */
+static void MDFilter ()
+{
+  MD_CTX context;
+  int len;
+  unsigned char buffer[16], digest[16];
+
+  MDInit (&context);
+  while (len = fread (buffer, 1, 16, stdin))
+ MDUpdate (&context, buffer, len);
+  MDFinal (digest, &context);
+
+  MDPrint (digest);
+  printf ("\n");
+}
+
+/* Prints a message digest in hexadecimal.
+ */
+static void MDPrint (digest)
+unsigned char digest[16];
+{
+
+
+
+Rivest                                                         [Page 20]
+
+RFC 1321              MD5 Message-Digest Algorithm            April 1992
+
+
+  unsigned int i;
+
+  for (i = 0; i < 16; i++)
+ printf ("%02x", digest[i]);
+}
+
+A.5 Test suite
+
+   The MD5 test suite (driver option "-x") should print the following
+   results:
+
+MD5 test suite:
+MD5 ("") = d41d8cd98f00b204e9800998ecf8427e
+MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661
+MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72
+MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0
+MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b
+MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =
+d174ab98d277d9f5a5611c2c9f419d9f
+MD5 ("123456789012345678901234567890123456789012345678901234567890123456
+78901234567890") = 57edf4a22be3c955ac49da2e2107b67a
+
+Security Considerations
+
+   The level of security discussed in this memo is considered to be
+   sufficient for implementing very high security hybrid digital-
+   signature schemes based on MD5 and a public-key cryptosystem.
+
+Author's Address
+
+   Ronald L. Rivest
+   Massachusetts Institute of Technology
+   Laboratory for Computer Science
+   NE43-324
+   545 Technology Square
+   Cambridge, MA  02139-1986
+
+   Phone: (617) 253-5880
+   EMail: rivest@theory.lcs.mit.edu
+
+
+
+
+
+
+
+
+
+
+
+
+Rivest                                                         [Page 21]
+
\ No newline at end of file
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp
index 2a43ff9..b689322 100644
--- a/src/compat/win32.cpp
+++ b/src/compat/win32.cpp
@@ -162,5 +162,27 @@ int Bu::Winsock2::__WSAFDIsSet( SOCKET s, fd_set *set ) {
         return (*Bu::Winsock2::_fnptr___WSAFDIsSet)( s, set );
 }
 
+Bu::String Bu::getLastWinError()
+{
+    LPVOID lpMsgBuf;
+    DWORD dw = GetLastError(); 
+
+    FormatMessageA(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        dw,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPSTR) &lpMsgBuf,
+        0, NULL );
+
+        Bu::String sRet( (char *)lpMsgBuf );
+
+    LocalFree(lpMsgBuf);
+
+        return sRet;
+}
+
 #endif
 
diff --git a/src/compat/win32.h b/src/compat/win32.h
index 67d80d3..1d82fbe 100644
--- a/src/compat/win32.h
+++ b/src/compat/win32.h
@@ -89,6 +89,8 @@ namespace Bu
                 static char scode[15];
                 static char *gai_strerror( int iCode );
         };
+
+        Bu::String getLastWinError();
 };
 
 #ifdef FD_ISSET
diff --git a/src/md5.cpp b/src/md5.cpp
index f971f23..71f17a0 100644
--- a/src/md5.cpp
+++ b/src/md5.cpp
@@ -11,31 +11,11 @@
 #include "bu/md5.h"
 #include "bu/stream.h"
 
-
-// This performs a wrapping bitwise shift, kinda' fun!
-
-#define bit_roll( num, cnt ) \
-        (((num) << (cnt)) | (((num) >> (32 - (cnt))) & ~(-1<<(cnt))))
-
-//#define md5_cmn( q, a, b, x, s, t ) (bit_roll((a + q + x + t), s) + b)
-
-// The following are handy wrappers for the cmn function
-#define md5_ff( a, b, c, d, x, s, t ) \
-        (md5_cmn((b & c) | ((~b) & d), a, b, x, s, t))
-
-#define md5_gg( a, b, c, d, x, s, t ) \
-        (md5_cmn((b & d) | (c & (~d)), a, b, x, s, t))
-
-#define md5_hh( a, b, c, d, x, s, t ) \
-        (md5_cmn(b ^ c ^ d, a, b, x, s, t))
-
-#define md5_ii( a, b, c, d, x, s, t ) \
-        (md5_cmn(c ^ (b | (~d)), a, b, x, s, t))
-
-inline long md5_cmn( long q, long a, long b, long x, long s, long t )
-{
-        return bit_roll((a + q + x + t), s) + b;
-}
+#ifdef SYSTEM_BIG_ENDIAN
+# define toLittleEndian( a, b ) _toLittleEndian( a, b )
+#else
+# define toLittleEndian( a, b ) (void)0
+#endif
 
 Bu::Md5::Md5()
 {
@@ -50,14 +30,13 @@ void Bu::Md5::reset()
 {
         // These are the magic seed numbers...
 
-        sum[0] = 1732584193;
-        sum[1] = -271733879;
-        sum[2] = -1732584194;
-        sum[3] =  271733878;
+        sum[0] = 0x67452301U;
+        sum[1] = 0xEFCDAB89U;
+        sum[2] = 0x98BADCFEU;
+        sum[3] = 0x10325476U;
 
-        iBytes = 0;
-        memset( inbuf, 0, 4*16 );
-        iFill = 0;
+        uBits[0] = 0;
+        uBits[1] = 0;
 }
 
 void Bu::Md5::setSalt( const Bu::String & /*sSalt*/ )
@@ -67,137 +46,201 @@ void Bu::Md5::setSalt( const Bu::String & /*sSalt*/ )
 void Bu::Md5::addData( const void *sVData, int iSize )
 {
         const char *sData = (const char *)sVData;
+        uint32_t t;
+
+        t = uBits[0];
+        if( (uBits[0] = t + ((uint32_t)iSize << 3)) < t )
+                uBits[1]++;
+        uBits[1] += iSize >> 29;
 
-        int iInPos = 0;
-        for(;;)
+        t = (t >> 3) & 0x3f;    /* How many bytes we have buffered */
+
+        /* Handle any leading odd-sized chunks */
+        if( t )
         {
-                for( ; iFill < 16*4 && iInPos < iSize; iFill++, iInPos++ )
-                {
-                        inbuf[iFill>>2] |= ((long)sData[iInPos]) << ((iFill*8)%32);
+                unsigned char *p = (unsigned char *) inbuf + t;
+
+                t = 64 - t;
+                if( iSize < t ) {
+                        memcpy( p, sData, iSize );
+                        return;
                 }
-                if( iFill < 16*4 )
-                        break;
-                compBlock( inbuf, sum );
-                memset( inbuf, 0, 4*16 );
-                iFill = 0;
+                memcpy( p, sData, t );
+                toLittleEndian( inbuf, 16 );
+                compBlock( sum, (uint32_t *)inbuf );
+                sData += t;
+                iSize -= t;
         }
-        iBytes += iSize;
+
+        /* Process data in 64-byte chunks */
+        while( iSize >= 64 )
+        {
+                memcpy( inbuf, sData, 64 );
+                toLittleEndian( inbuf, 16 );
+                compBlock( sum, (uint32_t *)inbuf );
+                sData += 64;
+                iSize -= 64;
+        }
+
+        /* Handle any remaining bytes of data. */
+        memcpy( inbuf, sData, iSize );
 }
 
 Bu::String Bu::Md5::getResult()
 {
-        long lsum[4];
+        uint32_t lsum[4];
         compCap( lsum );
         return Bu::String( (const char *)lsum, 4*4 );
 }
 
 void Bu::Md5::writeResult( Bu::Stream &sOut )
 {
-        long lsum[4];
+        uint32_t lsum[4];
         compCap( lsum );
         sOut.write( lsum, 4*4 );
 }
 
-void Bu::Md5::compCap( long *sumout )
+void Bu::Md5::compCap( uint32_t *sumout )
 {
+        uint8_t tmpbuf[64];
         memcpy( sumout, sum, 4*4 );
-        long lbuf[16];
-        memcpy( lbuf, inbuf, 4*16 );
-
-        lbuf[iFill>>2] |= 0x80 << ((iFill*8)%32);
-        uint64_t iBits = iBytes*8;
-        if( iBytes > 0 && iFill>>2 >= 14 )
-        {
-                compBlock( lbuf, sumout );
-                memset( lbuf, 0, 4*16 );
-                memcpy( lbuf+14, &iBits, 8 );
-                compBlock( lbuf, sumout );
-        }
-        else
-        {
-                memcpy( lbuf+14, &iBits, 8 );
-                compBlock( lbuf, sumout );
+        memcpy( tmpbuf, inbuf, 64 );
+
+        uint32_t count;
+        uint8_t *p;
+
+        /* Compute number of bytes mod 64 */
+        count = (uBits[0] >> 3) & 0x3F;
+
+        /* Set the first char of padding to 0x80.  This is safe since there is
+           always at least one byte free */
+        p = tmpbuf + count;
+        *p++ = 0x80;
+
+        /* Bytes of padding needed to make 64 bytes */
+        count = 64 - 1 - count;
+
+        /* Pad out to 56 mod 64 */
+        if (count < 8) {
+                /* Two lots of padding:  Pad the first block to 64 bytes */
+                memset( p, 0, count );
+                toLittleEndian( tmpbuf, 16 );
+                compBlock( sumout, (uint32_t *)tmpbuf );
+
+                /* Now fill the next block with 56 bytes */
+                memset( tmpbuf, 0, 56);
+        } else {
+                /* Pad block to 56 bytes */
+                memset( p, 0, count - 8);
         }
+        toLittleEndian( tmpbuf, 14 );
+
+        /* Append length in bits and transform */
+        ((uint32_t *) tmpbuf)[14] = uBits[0];
+        ((uint32_t *) tmpbuf)[15] = uBits[1];
+
+        compBlock( sumout, (uint32_t *)tmpbuf );
+        toLittleEndian((unsigned char *)sumout, 4);
 }
 
-void Bu::Md5::compBlock( long *x, long *lsum )
+#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))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+        ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+void Bu::Md5::compBlock( uint32_t *lsum, uint32_t *x )
 {
-        long a = lsum[0];
-        long b = lsum[1];
-        long c = lsum[2];
-        long d = lsum[3];
-
-        a = md5_ff(a, b, c, d, x[ 0], 7 , -680876936);
-        d = md5_ff(d, a, b, c, x[ 1], 12, -389564586);
-        c = md5_ff(c, d, a, b, x[ 2], 17,  606105819);
-        b = md5_ff(b, c, d, a, x[ 3], 22, -1044525330);
-        a = md5_ff(a, b, c, d, x[ 4], 7 , -176418897);
-        d = md5_ff(d, a, b, c, x[ 5], 12,  1200080426);
-        c = md5_ff(c, d, a, b, x[ 6], 17, -1473231341);
-        b = md5_ff(b, c, d, a, x[ 7], 22, -45705983);
-        a = md5_ff(a, b, c, d, x[ 8], 7 ,  1770035416);
-        d = md5_ff(d, a, b, c, x[ 9], 12, -1958414417);
-        c = md5_ff(c, d, a, b, x[10], 17, -42063);
-        b = md5_ff(b, c, d, a, x[11], 22, -1990404162);
-        a = md5_ff(a, b, c, d, x[12], 7 ,  1804603682);
-        d = md5_ff(d, a, b, c, x[13], 12, -40341101);
-        c = md5_ff(c, d, a, b, x[14], 17, -1502002290);
-        b = md5_ff(b, c, d, a, x[15], 22,  1236535329);
-
-        a = md5_gg(a, b, c, d, x[ 1], 5 , -165796510);
-        d = md5_gg(d, a, b, c, x[ 6], 9 , -1069501632);
-        c = md5_gg(c, d, a, b, x[11], 14,  643717713);
-        b = md5_gg(b, c, d, a, x[ 0], 20, -373897302);
-        a = md5_gg(a, b, c, d, x[ 5], 5 , -701558691);
-        d = md5_gg(d, a, b, c, x[10], 9 ,  38016083);
-        c = md5_gg(c, d, a, b, x[15], 14, -660478335);
-        b = md5_gg(b, c, d, a, x[ 4], 20, -405537848);
-        a = md5_gg(a, b, c, d, x[ 9], 5 ,  568446438);
-        d = md5_gg(d, a, b, c, x[14], 9 , -1019803690);
-        c = md5_gg(c, d, a, b, x[ 3], 14, -187363961);
-        b = md5_gg(b, c, d, a, x[ 8], 20,  1163531501);
-        a = md5_gg(a, b, c, d, x[13], 5 , -1444681467);
-        d = md5_gg(d, a, b, c, x[ 2], 9 , -51403784);
-        c = md5_gg(c, d, a, b, x[ 7], 14,  1735328473);
-        b = md5_gg(b, c, d, a, x[12], 20, -1926607734);
-
-        a = md5_hh(a, b, c, d, x[ 5], 4 , -378558);
-        d = md5_hh(d, a, b, c, x[ 8], 11, -2022574463);
-        c = md5_hh(c, d, a, b, x[11], 16,  1839030562);
-        b = md5_hh(b, c, d, a, x[14], 23, -35309556);
-        a = md5_hh(a, b, c, d, x[ 1], 4 , -1530992060);
-        d = md5_hh(d, a, b, c, x[ 4], 11,  1272893353);
-        c = md5_hh(c, d, a, b, x[ 7], 16, -155497632);
-        b = md5_hh(b, c, d, a, x[10], 23, -1094730640);
-        a = md5_hh(a, b, c, d, x[13], 4 ,  681279174);
-        d = md5_hh(d, a, b, c, x[ 0], 11, -358537222);
-        c = md5_hh(c, d, a, b, x[ 3], 16, -722521979);
-        b = md5_hh(b, c, d, a, x[ 6], 23,  76029189);
-        a = md5_hh(a, b, c, d, x[ 9], 4 , -640364487);
-        d = md5_hh(d, a, b, c, x[12], 11, -421815835);
-        c = md5_hh(c, d, a, b, x[15], 16,  530742520);
-        b = md5_hh(b, c, d, a, x[ 2], 23, -995338651);
-
-        a = md5_ii(a, b, c, d, x[ 0], 6 , -198630844);
-        d = md5_ii(d, a, b, c, x[ 7], 10,  1126891415);
-        c = md5_ii(c, d, a, b, x[14], 15, -1416354905);
-        b = md5_ii(b, c, d, a, x[ 5], 21, -57434055);
-        a = md5_ii(a, b, c, d, x[12], 6 ,  1700485571);
-        d = md5_ii(d, a, b, c, x[ 3], 10, -1894986606);
-        c = md5_ii(c, d, a, b, x[10], 15, -1051523);
-        b = md5_ii(b, c, d, a, x[ 1], 21, -2054922799);
-        a = md5_ii(a, b, c, d, x[ 8], 6 ,  1873313359);
-        d = md5_ii(d, a, b, c, x[15], 10, -30611744);
-        c = md5_ii(c, d, a, b, x[ 6], 15, -1560198380);
-        b = md5_ii(b, c, d, a, x[13], 21,  1309151649);
-        a = md5_ii(a, b, c, d, x[ 4], 6 , -145523070);
-        d = md5_ii(d, a, b, c, x[11], 10, -1120210379);
-        c = md5_ii(c, d, a, b, x[ 2], 15,  718787259);
-        b = md5_ii(b, c, d, a, x[ 9], 21, -343485551);
-
-        lsum[0] = a + lsum[0];
-        lsum[1] = b + lsum[1];
-        lsum[2] = c + lsum[2];
-        lsum[3] = d + lsum[3];
+        register uint32_t a, b, c, d;
+        a = lsum[0];
+        b = lsum[1];
+        c = lsum[2];
+        d = lsum[3];
+
+    MD5STEP(F1, a, b, c, d, x[0] + 0xd76aa478, 7);
+    MD5STEP(F1, d, a, b, c, x[1] + 0xe8c7b756, 12);
+    MD5STEP(F1, c, d, a, b, x[2] + 0x242070db, 17);
+    MD5STEP(F1, b, c, d, a, x[3] + 0xc1bdceee, 22);
+    MD5STEP(F1, a, b, c, d, x[4] + 0xf57c0faf, 7);
+    MD5STEP(F1, d, a, b, c, x[5] + 0x4787c62a, 12);
+    MD5STEP(F1, c, d, a, b, x[6] + 0xa8304613, 17);
+    MD5STEP(F1, b, c, d, a, x[7] + 0xfd469501, 22);
+    MD5STEP(F1, a, b, c, d, x[8] + 0x698098d8, 7);
+    MD5STEP(F1, d, a, b, c, x[9] + 0x8b44f7af, 12);
+    MD5STEP(F1, c, d, a, b, x[10] + 0xffff5bb1, 17);
+    MD5STEP(F1, b, c, d, a, x[11] + 0x895cd7be, 22);
+    MD5STEP(F1, a, b, c, d, x[12] + 0x6b901122, 7);
+    MD5STEP(F1, d, a, b, c, x[13] + 0xfd987193, 12);
+    MD5STEP(F1, c, d, a, b, x[14] + 0xa679438e, 17);
+    MD5STEP(F1, b, c, d, a, x[15] + 0x49b40821, 22);
+
+    MD5STEP(F2, a, b, c, d, x[1] + 0xf61e2562, 5);
+    MD5STEP(F2, d, a, b, c, x[6] + 0xc040b340, 9);
+    MD5STEP(F2, c, d, a, b, x[11] + 0x265e5a51, 14);
+    MD5STEP(F2, b, c, d, a, x[0] + 0xe9b6c7aa, 20);
+    MD5STEP(F2, a, b, c, d, x[5] + 0xd62f105d, 5);
+    MD5STEP(F2, d, a, b, c, x[10] + 0x02441453, 9);
+    MD5STEP(F2, c, d, a, b, x[15] + 0xd8a1e681, 14);
+    MD5STEP(F2, b, c, d, a, x[4] + 0xe7d3fbc8, 20);
+    MD5STEP(F2, a, b, c, d, x[9] + 0x21e1cde6, 5);
+    MD5STEP(F2, d, a, b, c, x[14] + 0xc33707d6, 9);
+    MD5STEP(F2, c, d, a, b, x[3] + 0xf4d50d87, 14);
+    MD5STEP(F2, b, c, d, a, x[8] + 0x455a14ed, 20);
+    MD5STEP(F2, a, b, c, d, x[13] + 0xa9e3e905, 5);
+    MD5STEP(F2, d, a, b, c, x[2] + 0xfcefa3f8, 9);
+    MD5STEP(F2, c, d, a, b, x[7] + 0x676f02d9, 14);
+    MD5STEP(F2, b, c, d, a, x[12] + 0x8d2a4c8a, 20);
+
+    MD5STEP(F3, a, b, c, d, x[5] + 0xfffa3942, 4);
+    MD5STEP(F3, d, a, b, c, x[8] + 0x8771f681, 11);
+    MD5STEP(F3, c, d, a, b, x[11] + 0x6d9d6122, 16);
+    MD5STEP(F3, b, c, d, a, x[14] + 0xfde5380c, 23);
+    MD5STEP(F3, a, b, c, d, x[1] + 0xa4beea44, 4);
+    MD5STEP(F3, d, a, b, c, x[4] + 0x4bdecfa9, 11);
+    MD5STEP(F3, c, d, a, b, x[7] + 0xf6bb4b60, 16);
+    MD5STEP(F3, b, c, d, a, x[10] + 0xbebfbc70, 23);
+    MD5STEP(F3, a, b, c, d, x[13] + 0x289b7ec6, 4);
+    MD5STEP(F3, d, a, b, c, x[0] + 0xeaa127fa, 11);
+    MD5STEP(F3, c, d, a, b, x[3] + 0xd4ef3085, 16);
+    MD5STEP(F3, b, c, d, a, x[6] + 0x04881d05, 23);
+    MD5STEP(F3, a, b, c, d, x[9] + 0xd9d4d039, 4);
+    MD5STEP(F3, d, a, b, c, x[12] + 0xe6db99e5, 11);
+    MD5STEP(F3, c, d, a, b, x[15] + 0x1fa27cf8, 16);
+    MD5STEP(F3, b, c, d, a, x[2] + 0xc4ac5665, 23);
+
+    MD5STEP(F4, a, b, c, d, x[0] + 0xf4292244, 6);
+    MD5STEP(F4, d, a, b, c, x[7] + 0x432aff97, 10);
+    MD5STEP(F4, c, d, a, b, x[14] + 0xab9423a7, 15);
+    MD5STEP(F4, b, c, d, a, x[5] + 0xfc93a039, 21);
+    MD5STEP(F4, a, b, c, d, x[12] + 0x655b59c3, 6);
+    MD5STEP(F4, d, a, b, c, x[3] + 0x8f0ccc92, 10);
+    MD5STEP(F4, c, d, a, b, x[10] + 0xffeff47d, 15);
+    MD5STEP(F4, b, c, d, a, x[1] + 0x85845dd1, 21);
+    MD5STEP(F4, a, b, c, d, x[8] + 0x6fa87e4f, 6);
+    MD5STEP(F4, d, a, b, c, x[15] + 0xfe2ce6e0, 10);
+    MD5STEP(F4, c, d, a, b, x[6] + 0xa3014314, 15);
+    MD5STEP(F4, b, c, d, a, x[13] + 0x4e0811a1, 21);
+    MD5STEP(F4, a, b, c, d, x[4] + 0xf7537e82, 6);
+    MD5STEP(F4, d, a, b, c, x[11] + 0xbd3af235, 10);
+    MD5STEP(F4, c, d, a, b, x[2] + 0x2ad7d2bb, 15);
+    MD5STEP(F4, b, c, d, a, x[9] + 0xeb86d391, 21);
+
+        lsum[0] += a;
+        lsum[1] += b;
+        lsum[2] += c;
+        lsum[3] += d;
 }
 
+void Bu::Md5::_toLittleEndian( uint8_t *buf, uint32_t count )
+{
+        uint32_t t;
+        do {
+                t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+                        ((unsigned) buf[1] << 8 | buf[0]);
+                *(uint32_t *) buf = t;
+                buf += 4;
+        } while( --count );
+}
diff --git a/src/md5.h b/src/md5.h
index d4a82ec..b7597fd 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -14,6 +14,8 @@ namespace Bu
 {
         /**
          * Class for easily calculating MD5 sums of just about any data.
+         * This code is based on some public domain code written by Colin Plumb in
+         * 1993.
          *@author Mike Buland
          */
         class Md5 : public Bu::CryptoHash
@@ -36,13 +38,16 @@ namespace Bu
                 /**
                  * Compute one block of input data.
                  */
-                void compBlock( long *x, long *lsum );
-                void compCap( long *sumout );
+                void compBlock( uint32_t *lsum, uint32_t *x );
+                void compCap( uint32_t *sumout );
+
+                void _addData( uint8_t *target, int &iCurFill, const void *sData,
+                                int iSize );
+                void _toLittleEndian( uint8_t *buf, uint32_t count );
                 
-                long inbuf[16];
-                long iFill;
-                long sum[4];
-                uint64_t iBytes;
+                uint8_t inbuf[64];
+                uint32_t sum[4];
+                uint32_t uBits[2];
         };
 };
 
diff --git a/src/plugger.cpp b/src/plugger.cpp
index 6e49b4e..fb6850a 100644
--- a/src/plugger.cpp
+++ b/src/plugger.cpp
@@ -7,9 +7,5 @@
 
 #include "bu/plugger.h"
 
-#ifndef WIN32
-
 namespace Bu { subExceptionDef( PluginException ) }
 
-#endif
-
diff --git a/src/plugger.h b/src/plugger.h
index 65ac4bb..2ba7b4b 100644
--- a/src/plugger.h
+++ b/src/plugger.h
@@ -8,15 +8,20 @@
 #ifndef BU_PLUGGER_H
 #define BU_PLUGGER_H
 
-#ifndef WIN32 //yeah, this one is going to take some work...
-
 #include "bu/hash.h"
 #include "bu/list.h"
-#include <dlfcn.h>
 #include "bu/exceptionbase.h"
 #include "bu/string.h"
 #include <stddef.h>
 
+#include "bu/config.h"
+
+#ifdef WIN32
+# include <windows.h>
+#else
+# include <dlfcn.h>
+#endif
+
 namespace Bu
 {
         subExceptionDecl( PluginException );
@@ -34,7 +39,11 @@ namespace Bu
         typedef struct PluginReg
         {
                 bool bBuiltin;
+#ifdef WIN32
+                HMODULE dlHandle;
+#else
                 void *dlHandle;
+#endif
                 PluginInfo *pInfo;
         } PluginReg;
 
@@ -69,6 +78,20 @@ namespace Bu
                         (void (*)( void * ))(destroy ##classname) };                                    \
         }
 
+//
+// This is probably the main interface to use, I'll describe it some here...
+//   structname - The name of the structure, this is what you have to pass to
+//                register.  Depending on how you build your dll/so files this
+//                will need to be unique (generally not)
+//   pluginname - This is what will be used by the plugin system to refer to
+//                your plugin once it's loaded.  This should be unique, but not
+//                a string
+//   classname  - The name of the class that is the plugin
+//   baseclass  - The name of the base class that is the parent of the plugin
+//   name       - The name of the author of this class (or company)
+//   ver        - an integer version number for the plugin
+//   rev        - an integer revision number for the plugin
+//
 #define PluginInterface3( structname, pluginname, classname, baseclass, name, ver, rev ) \
         extern "C" {                                                                                                                    \
                 baseclass *create ##classname()                                                                         \
@@ -85,6 +108,38 @@ namespace Bu
                         (void (*)( void * ))(destroy ##classname) };                                    \
         }
 
+        /**
+         * A complete dynamic plugin manager system.  This will allow you to design
+         * and use plugins that are compiled into your program and dynamically
+         * linked to your program interchangably.  It works on windows and on *nix
+         * and bsd type systems (anything that supports dlopen).  Basically you
+         * create a base class that will be the basic interface of your plugins.
+         * Then you create some classes that inherit from it, and use the
+         * PluginInterface3 macro to create the required data structures for it.
+         *
+         * Once you have plugins you can create a Plugger, by passing in the base
+         * class as it's template parameter.  Once it's created, you can register
+         * plugins.  To register a plugin that is builtin, you just need to pass
+         * a pointer to it's interface structure to the registerBuiltinPlugin
+         * function.  To register a plugin that is in a shared object or dll file
+         * you just pass the filename (with path, probably), and the name of the
+         * structure to load and you're all set.
+         *
+         * To instantiate an object from a plugin simply call instantiate with the
+         * name of the plugin as specified in the interface macro.  To destroy an
+         * object crated with the plugger do not delete it, instead pass it into
+         * Plugger's destroy function.
+         *
+         * Any objects not destroyed when the plugger is deleted will be destroyed
+         * automatically.
+         *
+         * It is important to note that some systems (linux at least) partition off
+         * the memory allocated by objects linked in at run time into a seperate
+         * segment that, while it can be accessed by the main program, cannot be
+         * safely or reliably freed by the main program.  With that in mind it is
+         * a good idea to free all memory allocated by a plugin object in the plugin
+         * object and not allow the calling program to delete it.
+         */
         template<class T>
         class Plugger
         {
@@ -111,7 +166,11 @@ namespace Bu
                         {
                                 if( (*i)->bBuiltin == false )
                                 {
+#ifdef WIN32
+                                        FreeLibrary( (*i)->dlHandle );
+#else
                                         dlclose( (*i)->dlHandle );
+#endif
                                 }
                                 delete (*i);
                         }
@@ -129,32 +188,42 @@ namespace Bu
                                 const Bu::String &sPluginName )
                 {
                         PluginReg *pReg;
-                        try {
-                                pReg = (PluginReg *)hPlugin[sPluginName];
-                                hPlugin.erase( sPluginName );
-                                dlclose( pReg->dlHandle );
-                                delete pReg;
-                                pReg = NULL;
-                        } catch( Bu::HashException &e )
-                        {
-                        }
+                        if( hPlugin.has( sPluginName ) )
+                                throw Bu::ExceptionBase("A plugin with name '%s' is already "
+                                        "loaded.", sPluginName.getStr() );
 
                         pReg = new PluginReg;
 
                         pReg->bBuiltin = false;
+#ifdef WIN32
+                        pReg->dlHandle = LoadLibrary( sFName.getStr() );
+                        if( pReg->dlHandle == NULL )
+                        {
+                                throw PluginException( 1, "Error opening %s: %s",
+                                        sFName.getStr(), Bu::getLastWinError().getStr() );
+                        }
+                        pReg->pInfo = (PluginInfo *)GetProcAddress( pReg->dlHandle,
+                                        sPluginName.getStr() );
+                        if( pReg->pInfo == NULL )
+                        {
+                                throw PluginException( 2, "Error mapping %s: %s",
+                                        sFName.getStr(), Bu::getLastWinError().getStr() );
+                        }
+#else
                         pReg->dlHandle = dlopen( sFName.getStr(), RTLD_NOW );
                         if( pReg->dlHandle == NULL )
                         {
-                                throw PluginException( 1, "Error on %s: %s", sFName.getStr(),
-                                                dlerror() );
+                                throw PluginException( 1, "Error opening %s: %s",
+                                        sFName.getStr(), dlerror() );
                         }
                         pReg->pInfo = (PluginInfo *)dlsym( pReg->dlHandle,
                                         sPluginName.getStr() );
                         if( pReg->pInfo == NULL )
                         {
-                                throw PluginException( 2, "Error on %s: %s", sFName.getStr(),
-                                                dlerror() );
+                                throw PluginException( 2, "Error mapping %s: %s",
+                                        sFName.getStr(), dlerror() );
                         }
+#endif
                         hPlugin.insert( pReg->pInfo->sID, pReg );
                 }
 
@@ -195,7 +264,11 @@ namespace Bu
                         {
                                 if( (*i)->bBuiltin == false )
                                 {
+#ifdef WIN32
+                                        FreeLibrary( (*i)->dlHandle );
+#else
                                         dlclose( (*i)->dlHandle );
+#endif
                                 }
                                 delete (*i);
                         }
@@ -213,6 +286,4 @@ namespace Bu
         };
 }
 
-#endif //#ifndef WIN32 //yeah, this one is going to take some work...
-
 #endif
diff --git a/src/tcpsocket.h b/src/tcpsocket.h
index a05580a..dbaaa5e 100644
--- a/src/tcpsocket.h
+++ b/src/tcpsocket.h
@@ -66,7 +66,6 @@ namespace Bu
                 virtual ~TcpSocket();
                 
                 virtual void close();
-                //virtual void read();
                 virtual size read( void *pBuf, size nBytes );
                 virtual size read( void *pBuf, size nBytes,
                                 uint32_t nSec, uint32_t nUSec=0 );
diff --git a/src/tests/udpsocket.cpp b/src/tests/udpsocket.cpp
new file mode 100644
index 0000000..2a74acf
--- /dev/null
+++ b/src/tests/udpsocket.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/udpsocket.h"
+#include "bu/sio.h"
+
+#include <errno.h>
+#include <arpa/inet.h> 
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/utsname.h>
+
+using namespace Bu;
+
+int main( int argc, char *argv[] )
+{
+        sio << Fmt::hex(8) << INADDR_ANY << sio.nl << Fmt::hex(8) << inet_addr("0.0.0.0") << sio.nl;
+        if( argc == 1 )
+        {
+                sio << "Options are 'l' for listening and 'b' for broadcasting."
+                        << sio.nl;
+        }
+        else if( argv[1][0] == 'l' )
+        {
+                sio << "Listening..." << sio.nl;
+                Bu::UdpSocket udp( "0.0.0.0", 6688, UdpSocket::Read|UdpSocket::Broadcast );
+
+                for(;;)
+                {
+                        char buf[1501];
+                        int iRead = udp.read( buf, 1500 );
+                        if( iRead >= 0 )
+                        {
+                                buf[iRead] = '\0';
+                                sio << "Read(" << iRead << "): '" << buf << "'" << sio.nl;
+                        }
+                        else
+                        {
+                                sio << "Got " << iRead << ": " << strerror( errno ) << sio.nl;
+                        }
+                }
+        }
+        else if( argv[1][0] == 'L' )
+        {
+                sio << "Listening..." << sio.nl;
+                Bu::UdpSocket udp( "0.0.0.0", 6688, UdpSocket::Read|UdpSocket::Broadcast );
+
+                for(;;)
+                {
+                        char buf[1501];
+                        Bu::UdpSocket::addr aHost;
+                        int iPort;
+                        int iRead = udp.read( buf, 1500, aHost, iPort );
+                        if( iRead >= 0 )
+                        {
+                                buf[iRead] = '\0';
+                                sio << "Read(" << iRead << ") from " << Bu::UdpSocket::addrToStr( aHost ) << ":" << iPort << ": '" << buf << "'" << sio.nl;
+                        }
+                }
+        }
+        else if( argv[1][0] == 'b' )
+        {
+                sio << "Broadcasting..." << sio.nl;
+                Bu::UdpSocket udp("255.255.255.255", 6688,
+                                UdpSocket::Write|UdpSocket::Broadcast );
+
+                for(;;)
+                {
+                        int iWrote = udp.write("hello", 5 );
+                        sio << "Wrote(" << iWrote << "): " << strerror( errno ) << sio.nl;
+                        usleep( 250000 );
+                }
+        }
+        else
+        {
+                sio << "Options are 'l' for listening and 'b' for broadcasting."
+                        << sio.nl;
+        }
+
+        return 0;
+}
+
diff --git a/src/udpsocket.cpp b/src/udpsocket.cpp
new file mode 100644
index 0000000..91e04c1
--- /dev/null
+++ b/src/udpsocket.cpp
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/udpsocket.h"
+
+#include "bu/sio.h"
+using namespace Bu;
+#include <fcntl.h>
+
+#include <errno.h>
+#include <arpa/inet.h> 
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/utsname.h>
+
+namespace Bu { subExceptionDef( UdpSocketException ) }
+
+#define saTarget ( *((struct sockaddr_in *)paTarget) )
+
+Bu::UdpSocket::UdpSocket( int iUdpSocket ) :
+        iUdpSocket( iUdpSocket ),
+        paTarget( NULL ),
+        bBound( false )
+{
+}
+
+Bu::UdpSocket::UdpSocket( const Bu::String &sAddr, int iPort, int iFlags ) :
+        iUdpSocket( 0 ),
+        paTarget( NULL ),
+        bBound( false )
+{
+        iUdpSocket = socket( PF_INET, SOCK_DGRAM, 0 );
+        if( iUdpSocket < 0 )
+        {
+                throw UdpSocketException("Couldn't open udp socket: %s",
+                        strerror( errno )
+                        );
+        }
+
+        if( (iFlags&Broadcast) )
+        {
+                int broadcast = 1;
+                if( (setsockopt( iUdpSocket, SOL_SOCKET, SO_BROADCAST,
+                        &broadcast, sizeof(broadcast) )) == -1)
+                {
+                        throw UdpSocketException("Couldn't set udp socket to broadcast: %s",
+                                strerror( errno )
+                                );
+                }
+        }
+        
+        paTarget = new struct sockaddr_in;
+        saTarget.sin_family = AF_INET;
+        saTarget.sin_port = htons( iPort );
+        saTarget.sin_addr.s_addr = inet_addr( sAddr.getStr() ); // INADDR_ANY;
+        memset( saTarget.sin_zero, '\0', sizeof(saTarget.sin_zero) );
+        
+        if( (iFlags&Read) )
+        {
+                if( bind( iUdpSocket, (struct sockaddr*)paTarget, sizeof(struct sockaddr_in) )
+                                == -1 )
+                {
+                        throw UdpSocketException("Couldn't bind port to udp socket: %s",
+                                strerror( errno )
+                                );
+                }
+                bBound = true;
+        }
+}
+
+Bu::UdpSocket::~UdpSocket()
+{
+        close();
+        delete (struct sockaddr_in *)paTarget;
+        paTarget = NULL;
+}
+
+Bu::String Bu::UdpSocket::addrToStr( const addr &a )
+{
+        Bu::String sOut;
+        sOut.format("%d.%d.%d.%d",
+                (a&0xff),
+                (a&0xff00)>>8,
+                (a&0xff0000)>>16,
+                (a&0xff000000)>>24
+                );
+
+        return sOut;
+}
+
+void Bu::UdpSocket::close()
+{
+        ::close( iUdpSocket );
+}
+
+Bu::size Bu::UdpSocket::read( void *pBuf, Bu::size nBytes )
+{
+        return recv( iUdpSocket, pBuf, nBytes, 0 );
+}
+
+Bu::size Bu::UdpSocket::read( void *pBuf, Bu::size nBytes,
+                Bu::UdpSocket::addr &aHost, int &iPort )
+{
+        sockaddr_in name;
+        size_t size = sizeof(name);
+        Bu::size ret = recvfrom( iUdpSocket, pBuf, nBytes, 0,
+                        (struct sockaddr *)&name, &size );
+        aHost = name.sin_addr.s_addr;
+        iPort = ntohs(name.sin_port);
+        return ret;
+}
+
+Bu::size Bu::UdpSocket::write( const void *pBuf, Bu::size nBytes )
+{
+        if( bBound )
+        {
+                return sendto( iUdpSocket, pBuf, nBytes, 0, NULL, 0 );
+        }
+        else
+        {
+                return sendto( iUdpSocket, pBuf, nBytes, 0,
+                        (struct sockaddr*)paTarget, sizeof(struct sockaddr_in) );
+        }
+}
+
+Bu::size Bu::UdpSocket::tell()
+{
+        throw Bu::UnsupportedException();
+}
+
+void Bu::UdpSocket::seek( Bu::size )
+{
+        throw Bu::UnsupportedException();
+}
+
+void Bu::UdpSocket::setPos( Bu::size )
+{
+        throw Bu::UnsupportedException();
+}
+
+void Bu::UdpSocket::setPosEnd( Bu::size )
+{
+        throw Bu::UnsupportedException();
+}
+
+bool Bu::UdpSocket::isEos()
+{
+        return false;
+}
+
+bool Bu::UdpSocket::isOpen()
+{
+        return true;
+}
+
+void Bu::UdpSocket::flush()
+{
+}
+
+bool Bu::UdpSocket::canRead()
+{
+        return bBound;
+}
+
+bool Bu::UdpSocket::canWrite()
+{
+        return true;
+}
+
+bool Bu::UdpSocket::isReadable()
+{
+        return bBound;
+}
+
+bool Bu::UdpSocket::isWritable()
+{
+        return true;
+}
+
+bool Bu::UdpSocket::isSeekable()
+{
+        return false;
+}
+
+bool Bu::UdpSocket::isBlocking()
+{
+        return true;
+}
+
+void Bu::UdpSocket::setBlocking( bool bBlocking )
+{
+#ifndef WIN32
+        if( bBlocking )
+        {
+                fcntl( iUdpSocket, F_SETFL, fcntl( iUdpSocket, F_GETFL, 0 ) & (~O_NONBLOCK) );
+        }
+        else
+        {
+                fcntl( iUdpSocket, F_SETFL, fcntl( iUdpSocket, F_GETFL, 0 ) | O_NONBLOCK );
+        }
+#else
+        u_long iMode;
+        if( bBlocking )
+                iMode = 0;
+        else
+                iMode = 1;
+        //-------------------------
+        // Set the socket I/O mode: In this case FIONBIO
+        // enables or disables the blocking mode for the 
+        // socket based on the numerical value of iMode.
+        // If iMode = 0, blocking is enabled; 
+        // If iMode != 0, non-blocking mode is enabled.
+        bu_ioctlsocket(iUdpSocket, FIONBIO, &iMode);
+#endif  
+}
+
+void Bu::UdpSocket::setSize( Bu::size )
+{
+        throw Bu::UnsupportedException();
+}
+
+Bu::size Bu::UdpSocket::getSize() const
+{
+        throw Bu::UnsupportedException();
+}
+
+Bu::size Bu::UdpSocket::getBlockSize() const
+{
+        return 1500;
+}
+
+Bu::String Bu::UdpSocket::getLocation() const
+{
+        throw Bu::UnsupportedException();
+}
+
diff --git a/src/udpsocket.h b/src/udpsocket.h
new file mode 100644
index 0000000..8fe114d
--- /dev/null
+++ b/src/udpsocket.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#ifndef BU_UDP_SOCKET_H
+#define BU_UDP_SOCKET_H
+
+#include <stdint.h>
+
+#include "bu/stream.h"
+
+namespace Bu
+{
+        subExceptionDecl( UdpSocketException );
+
+        class UdpSocket : public Stream
+        {
+        public:
+                UdpSocket( int iUdpSocket );
+                UdpSocket( const Bu::String &sAddr, int iPort, int iFlags );
+                virtual ~UdpSocket();
+
+                typedef uint32_t addr;
+
+                static Bu::String addrToStr( const addr &a );
+
+                virtual void close();
+                virtual Bu::size read( void *pBuf, Bu::size nBytes );
+                virtual Bu::size read( void *pBuf, Bu::size nBytes,
+                                addr &sHost, int &iPort );
+                virtual Bu::size write( const void *pBuf, Bu::size nBytes );
+                using Stream::write;
+
+                virtual Bu::size tell();
+                virtual void seek( Bu::size offset );
+                virtual void setPos( Bu::size pos );
+                virtual void setPosEnd( Bu::size pos );
+                virtual bool isEos();
+                virtual bool isOpen();
+
+                virtual void flush();
+
+                virtual bool canRead();
+                virtual bool canWrite();
+
+                virtual bool isReadable();
+                virtual bool isWritable();
+                virtual bool isSeekable();
+
+                virtual bool isBlocking();
+                virtual void setBlocking( bool bBlocking=true );
+
+                virtual void setSize( Bu::size iSize );
+
+                enum {
+                        // Flags
+                        Read            = 0x01, ///< Open udp socket for reading
+                        Write           = 0x02, ///< Open udp socket for writing
+                        ReadWrite       = 0x03, ///< Open for both read and write
+                        Broadcast   = 0x04, ///< Open for broadcast
+                };
+
+                virtual size getSize() const;
+                virtual size getBlockSize() const;
+                virtual Bu::String getLocation() const;
+
+        private:
+#ifdef WIN32
+                unsigned int iUdpSocket;
+#else
+                int iUdpSocket;
+#endif
+                void *paTarget;
+                bool bBound;
+        };
+};
+
+#endif
diff --git a/src/unit/md5.unit b/src/unit/md5.unit
new file mode 100644
index 0000000..248aaaf
--- /dev/null
+++ b/src/unit/md5.unit
@@ -0,0 +1,82 @@
+// vim: syntax=cpp
+/*
+ * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/md5.h"
+
+#include <stdlib.h>
+
+suite Md5
+{
+        test basics
+        {
+#define tryStr( a, b ) \
+        { Bu::Md5 m; m.addData(a); unitTest( m.getHexResult() == b ); } (void)0
+                tryStr("", "d41d8cd98f00b204e9800998ecf8427e");
+                tryStr("a", "0cc175b9c0f1b6a831c399e269772661");
+                tryStr("abc", "900150983cd24fb0d6963f7d28e17f72");
+                tryStr("message digest", "f96b697d7cb7938d525a2f31aaf161d0");
+                tryStr("abcdefghijklmnopqrstuvwxyz",
+                        "c3fcd3d76192e4007dfb496cca67e13b");
+                tryStr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+                        "d174ab98d277d9f5a5611c2c9f419d9f");
+                tryStr("12345678901234567890123456789012345"
+                        "678901234567890123456789012345678901234567890",
+                        "57edf4a22be3c955ac49da2e2107b67a");
+        }
+
+        test twoChunks
+        {
+                Bu::Md5 m;
+                m.addData("12345678901234567890123456789012345");
+                m.addData("678901234567890123456789012345678901234567890");
+                unitTest( m.getHexResult() == "57edf4a22be3c955ac49da2e2107b67a" );
+        }
+
+        test biggerBlocks
+        {
+                const char *sums[33] = {
+                        "75fcf199abe516903321095a588b938d",
+                        "e26a863c96d6bdba6601175aedaae108",
+                        "2b207fdcb222078d3ebfeb8d5e7c9315",
+                        "b08683aaa465add72cc2b43ae42f4f70",
+                        "638bb73963b2d925771c3579ccb5e879",
+                        "c727bd4b48a88e3df5924a2604de0790",
+                        "f33d21203c80490f7342e5853c5550eb",
+                        "db449faca66a177aae59b1e36a19d053",
+                        "c800d429afb5f5c820f75c2c94e2e2bb",
+                        "43b79c70b9a6a11e823ffbfa0f45a4db",
+                        "0177ffc483cf598ae3966b3a5ae00c8c",
+                        "1a68fdf4b17a3820d48d101e9355a818"
+                };
+
+                char block[128];
+                for( int i = 0; i < 128; i++ )
+                        block[i] = i*2;
+
+                const char **curSum = sums;
+                for( int j = 1; j < 4096; j*=2 )
+                {
+                        /*
+                        Bu::File fOut("temp", Bu::File::WriteNew );
+                        for( int b = 0; b < j; b++ )
+                        {
+                                fOut.write( block, 128 );
+                        }
+                        fOut.close();
+                        system("md5sum -b temp");
+                        */
+                        Bu::Md5 m;
+                        for( int b = 0; b < j; b++ )
+                        {
+                                m.addData( block, 128 );
+                        }
+                        unitTest( m.getHexResult() == *curSum );
+                        curSum++;
+                } 
+        }
+}