sid player is now real plugin (dynamically loaded)

ported sid code to new API
moved to different md5 library
added more md5 functions to plugin API

3 files changed, 424 insertions, 834 deletions

diff --git a/md5/md5.c b/md5/md5.c
index 52e2d07a..c35d96c5 100644
--- a/md5/md5.c
+++ b/md5/md5.c
@@ -1,559 +1,381 @@
 /*
- * Functions to compute MD5 message digest of files or memory blocks
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * Copyright (C) 1995, 1996 Free Software Foundation, Inc.  NOTE: The
- * canonical source of this file is maintained with the GNU C Library.
- * Bugs can be reported to bug-glibc@prep.ai.mit.edu.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- * Modified by Gray Watson <http://256.com/gray/>, 1997.
- *
- */
-
-/*
- * NOTE: during quick performance tests on a Sun Sparc Ultra 1 and an
- * Alpha 255 300, these functions performed upwards of 3mb/sec
- * including disk I/O time.
- */
-
-/*
- * MD5 Test Suite from RFC1321: http://ds.internic.net:/rfc/rfc1321.txt
- *
- * MD5 ("") = d41d8cd98f00b204e9800998ecf8427e
- * MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661
- * MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72
- * MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0
- * MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b
- * MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =
- * d174ab98d277d9f5a5611c2c9f419d9f
- * MD5 ("123456789012345678901234567890123456789012345678901234567890123456
- * 78901234567890") = 57edf4a22be3c955ac49da2e2107b67a
- */
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+  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.
 
-#include "md5.h"
-#include "md5_loc.h"
+  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:
 
-/* version id for the library */
-/* static char *version_id = "$MD5Version: 1.0.0 November-19-1997 $"; */
+  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.
 
-/****************************** local routines *******************************/
+  L. Peter Deutsch
+  ghost@aladdin.com
 
-/*
- * process_block
- *
- * DESCRIPTION:
- *
- * Process a block of bytes into a MD5 state structure.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure from which we are getting the result.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
  */
-static	void	process_block(md5_t *md5_p, const void *buffer,
-			      const unsigned int buf_len)
-{
-  md5_uint32	correct[16];
-  const void	*buf_p = buffer, *end_p;
-  unsigned int	words_n;
-  md5_uint32	A, B, C, D;
-
-  words_n = buf_len / sizeof(md5_uint32);
-  end_p = (char *)buf_p + words_n * sizeof(md5_uint32);
-
-  A = md5_p->md_A;
-  B = md5_p->md_B;
-  C = md5_p->md_C;
-  D = md5_p->md_D;
-
-  /*
-   * First increment the byte count.  RFC 1321 specifies the possible
-   * length of the file up to 2^64 bits.  Here we only compute the
-   * number of bytes with a double word increment.  Modified to do
-   * this to better avoid overflows in the lower word -- Gray 10/97.
-   */
-  if (md5_p->md_total[0] > MAX_MD5_UINT32 - buf_len) {
-    md5_p->md_total[1]++;
-    md5_p->md_total[0] -= (MAX_MD5_UINT32 - buf_len);
-  }
-  else {
-    md5_p->md_total[0] += buf_len;
-  }
-
-  /*
-   * Process all bytes in the buffer with MD5_BLOCK bytes in each
-   * round of the loop.
-   */
-  while (buf_p < end_p) {
-    md5_uint32	A_save, B_save, C_save, D_save;
-    md5_uint32	*corr_p = correct;
-
-    A_save = A;
-    B_save = B;
-    C_save = C;
-    D_save = D;
-
-    /*
-     * Before we start, one word to the strange constants.  They are
-     * defined in RFC 1321 as
-     *
-     * T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..MD5_BLOCK
-     */
-
-    /* Round 1. */
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0xd76aa478);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0xe8c7b756);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0x242070db);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0xc1bdceee);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0xf57c0faf);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0x4787c62a);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xa8304613);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0xfd469501);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0x698098d8);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0x8b44f7af);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xffff5bb1);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0x895cd7be);
-    OP1 (A, B, C, D, buf_p, corr_p,  7, 0x6b901122);
-    OP1 (D, A, B, C, buf_p, corr_p, 12, 0xfd987193);
-    OP1 (C, D, A, B, buf_p, corr_p, 17, 0xa679438e);
-    OP1 (B, C, D, A, buf_p, corr_p, 22, 0x49b40821);
-
-    /* Round 2. */
-    OP234 (FG, A, B, C, D, correct[  1],  5, 0xf61e2562);
-    OP234 (FG, D, A, B, C, correct[  6],  9, 0xc040b340);
-    OP234 (FG, C, D, A, B, correct[ 11], 14, 0x265e5a51);
-    OP234 (FG, B, C, D, A, correct[  0], 20, 0xe9b6c7aa);
-    OP234 (FG, A, B, C, D, correct[  5],  5, 0xd62f105d);
-    OP234 (FG, D, A, B, C, correct[ 10],  9, 0x02441453);
-    OP234 (FG, C, D, A, B, correct[ 15], 14, 0xd8a1e681);
-    OP234 (FG, B, C, D, A, correct[  4], 20, 0xe7d3fbc8);
-    OP234 (FG, A, B, C, D, correct[  9],  5, 0x21e1cde6);
-    OP234 (FG, D, A, B, C, correct[ 14],  9, 0xc33707d6);
-    OP234 (FG, C, D, A, B, correct[  3], 14, 0xf4d50d87);
-    OP234 (FG, B, C, D, A, correct[  8], 20, 0x455a14ed);
-    OP234 (FG, A, B, C, D, correct[ 13],  5, 0xa9e3e905);
-    OP234 (FG, D, A, B, C, correct[  2],  9, 0xfcefa3f8);
-    OP234 (FG, C, D, A, B, correct[  7], 14, 0x676f02d9);
-    OP234 (FG, B, C, D, A, correct[ 12], 20, 0x8d2a4c8a);
-
-    /* Round 3. */
-    OP234 (FH, A, B, C, D, correct[  5],  4, 0xfffa3942);
-    OP234 (FH, D, A, B, C, correct[  8], 11, 0x8771f681);
-    OP234 (FH, C, D, A, B, correct[ 11], 16, 0x6d9d6122);
-    OP234 (FH, B, C, D, A, correct[ 14], 23, 0xfde5380c);
-    OP234 (FH, A, B, C, D, correct[  1],  4, 0xa4beea44);
-    OP234 (FH, D, A, B, C, correct[  4], 11, 0x4bdecfa9);
-    OP234 (FH, C, D, A, B, correct[  7], 16, 0xf6bb4b60);
-    OP234 (FH, B, C, D, A, correct[ 10], 23, 0xbebfbc70);
-    OP234 (FH, A, B, C, D, correct[ 13],  4, 0x289b7ec6);
-    OP234 (FH, D, A, B, C, correct[  0], 11, 0xeaa127fa);
-    OP234 (FH, C, D, A, B, correct[  3], 16, 0xd4ef3085);
-    OP234 (FH, B, C, D, A, correct[  6], 23, 0x04881d05);
-    OP234 (FH, A, B, C, D, correct[  9],  4, 0xd9d4d039);
-    OP234 (FH, D, A, B, C, correct[ 12], 11, 0xe6db99e5);
-    OP234 (FH, C, D, A, B, correct[ 15], 16, 0x1fa27cf8);
-    OP234 (FH, B, C, D, A, correct[  2], 23, 0xc4ac5665);
-
-    /* Round 4. */
-    OP234 (FI, A, B, C, D, correct[  0],  6, 0xf4292244);
-    OP234 (FI, D, A, B, C, correct[  7], 10, 0x432aff97);
-    OP234 (FI, C, D, A, B, correct[ 14], 15, 0xab9423a7);
-    OP234 (FI, B, C, D, A, correct[  5], 21, 0xfc93a039);
-    OP234 (FI, A, B, C, D, correct[ 12],  6, 0x655b59c3);
-    OP234 (FI, D, A, B, C, correct[  3], 10, 0x8f0ccc92);
-    OP234 (FI, C, D, A, B, correct[ 10], 15, 0xffeff47d);
-    OP234 (FI, B, C, D, A, correct[  1], 21, 0x85845dd1);
-    OP234 (FI, A, B, C, D, correct[  8],  6, 0x6fa87e4f);
-    OP234 (FI, D, A, B, C, correct[ 15], 10, 0xfe2ce6e0);
-    OP234 (FI, C, D, A, B, correct[  6], 15, 0xa3014314);
-    OP234 (FI, B, C, D, A, correct[ 13], 21, 0x4e0811a1);
-    OP234 (FI, A, B, C, D, correct[  4],  6, 0xf7537e82);
-    OP234 (FI, D, A, B, C, correct[ 11], 10, 0xbd3af235);
-    OP234 (FI, C, D, A, B, correct[  2], 15, 0x2ad7d2bb);
-    OP234 (FI, B, C, D, A, correct[  9], 21, 0xeb86d391);
-
-    /* Add the starting values of the context. */
-    A += A_save;
-    B += B_save;
-    C += C_save;
-    D += D_save;
-  }
-
-  /* Put checksum in context given as argument. */
-  md5_p->md_A = A;
-  md5_p->md_B = B;
-  md5_p->md_C = C;
-  md5_p->md_D = D;
-}
-
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
 /*
- * md5_get_result
- *
- * DESCRIPTION:
- *
- * Copy the resulting MD5 signature from MD5_P into the first 16 bytes
- * (MD5_SIZE) of the result buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure from which we are getting the result.
- *
- * result - A 16 byte buffer that will contain the MD5 signature.
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  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-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  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.
  */
-static	void	md5_get_result(const md5_t *md5_p, void *result)
-{
-  md5_uint32	hold;
-  void		*res_p = result;
-
-  hold = SWAP(md5_p->md_A);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
-
-  hold = SWAP(md5_p->md_B);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
 
-  hold = SWAP(md5_p->md_C);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-  res_p = (char *)res_p + sizeof(md5_uint32);
-
-  hold = SWAP(md5_p->md_D);
-  memcpy(res_p, &hold, sizeof(md5_uint32));
-}
-
-/***************************** exported routines *****************************/
-
-/*
- * md5_init
- *
- * DESCRIPTION:
- *
- * Initialize structure containing state of MD5 computation. (RFC 1321,
- * 3.3: Step 3).  This is for progressive MD5 calculations only.  If
- * you have the complete string available, md5_buffer should be used.
- * md5_process should be called for each bunch of bytes and after the
- * last process call, md5_finish should be called to get the
- * signature.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to md5 structure that we are initializing.
- */
-void	md5_init(md5_t *md5_p)
-{
-  md5_p->md_A = 0x67452301;
-  md5_p->md_B = 0xefcdab89;
-  md5_p->md_C = 0x98badcfe;
-  md5_p->md_D = 0x10325476;
-
-  md5_p->md_total[0] = 0;
-  md5_p->md_total[1] = 0;
-  md5_p->md_buf_len = 0;
-}
+#include "md5.h"
+#include <string.h>
 
-/*
- * md5_process
- *
- * DESCRIPTION:
- *
- * This function is used to progressively calculate a MD5 signature some
- * number of bytes at a time.  If you have the complete string
- * available, md5_buffer should be used.  The MD5 structure should
- * have been initialized with md5_init and after the last process
- * call, md5_finish should be called to get the results.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are progressively updating.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- */
-void	md5_process(md5_t *md5_p, const void *buffer,
-		    const unsigned int buf_len)
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 {
-  unsigned int	len = buf_len;
-  unsigned int	in_block, add;
-
-  /*
-   * When we already have some bytes in our internal buffer, copy some
-   * from the user to fill the block.
-   */
-  if (md5_p->md_buf_len > 0) {
-    
-    in_block = md5_p->md_buf_len;
-    if (in_block + len > sizeof(md5_p->md_buffer)) {
-      add = sizeof(md5_p->md_buffer) - in_block;
-    }
-    else {
-      add = len;
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
     }
 
-    memcpy (md5_p->md_buffer + in_block, buffer, add);
-    md5_p->md_buf_len += add;
-    in_block += add;
-
-    if (in_block > MD5_BLOCK_SIZE) {
-      process_block (md5_p, md5_p->md_buffer, in_block & ~BLOCK_SIZE_MASK);
-      /* the regions in the following copy operation will not overlap. */
-      memcpy (md5_p->md_buffer,
-	      md5_p->md_buffer + (in_block & ~BLOCK_SIZE_MASK),
-	      in_block & BLOCK_SIZE_MASK);
-      md5_p->md_buf_len = in_block & BLOCK_SIZE_MASK;
-    }
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 
-    buffer = (const char *)buffer + add;
-    len -= add;
-  }
-
-  /* process available complete blocks right from the user buffer */
-  if (len > MD5_BLOCK_SIZE) {
-    process_block (md5_p, buffer, len & ~BLOCK_SIZE_MASK);
-    buffer = (const char *) buffer + (len & ~BLOCK_SIZE_MASK);
-    len &= BLOCK_SIZE_MASK;
-  }
-
-  /* copy remaining bytes into the internal buffer */
-  if (len > 0) {
-    memcpy (md5_p->md_buffer, buffer, len);
-    md5_p->md_buf_len = len;
-  }
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#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
+
+     /* 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;
 }
 
-/*
- * md5_finish
- *
- * DESCRIPTION:
- *
- * Finish a progressing MD5 calculation and copy the resulting MD5
- * signature into the result buffer which should be 16 bytes
- * (MD5_SIZE).  After this call, the MD5 structure is invalid.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are finishing.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-void	md5_finish(md5_t *md5_p, void *signature)
+void
+md5_init(md5_state_t *pms)
 {
-  md5_uint32	bytes, hold;
-  int		pad;
-
-  /* take yet unprocessed bytes into account */
-  bytes = md5_p->md_buf_len;
-
-  /*
-   * Count remaining bytes.  Modified to do this to better avoid
-   * overflows in the lower word -- Gray 10/97.
-   */
-  if (md5_p->md_total[0] > MAX_MD5_UINT32 - bytes) {
-    md5_p->md_total[1]++;
-    md5_p->md_total[0] -= (MAX_MD5_UINT32 - bytes);
-  }
-  else {
-    md5_p->md_total[0] += bytes;
-  }
-
-  /*
-   * Pad the buffer to the next MD5_BLOCK-byte boundary.  (RFC 1321,
-   * 3.1: Step 1).  We need enough room for two size words and the
-   * bytes left in the buffer.  For some reason even if we are equal
-   * to the block-size, we add an addition block of pad bytes.
-   */
-  pad = MD5_BLOCK_SIZE - (sizeof(md5_uint32) * 2) - bytes;
-  if (pad <= 0) {
-    pad += MD5_BLOCK_SIZE;
-  }
-
-  /*
-   * Modified from a fixed array to this assignment and memset to be
-   * more flexible with block-sizes -- Gray 10/97.
-   */
-  if (pad > 0) {
-    /* some sort of padding start byte */
-    md5_p->md_buffer[bytes] = (unsigned char)0x80;
-    if (pad > 1) {
-      memset (md5_p->md_buffer + bytes + 1, 0, pad - 1);
-    }
-    bytes += pad;
-  }
-
-  /* put the 64-bit file length in _bits_ (i.e. *8) at the end of the buffer */
-  hold = SWAP(md5_p->md_total[0] << 3);
-  memcpy(md5_p->md_buffer + bytes, &hold, sizeof(md5_uint32));
-  bytes += sizeof(md5_uint32);
-
-  /* shift the high word over by 3 and add in the top 3 bits from the low */
-  hold = SWAP((md5_p->md_total[1] << 3) | (md5_p->md_total[0] >> 29));
-  memcpy(md5_p->md_buffer + bytes, &hold, sizeof(md5_uint32));
-  bytes += sizeof(md5_uint32);
-
-  /* process last bytes, the padding chars, and size words */
-  process_block(md5_p, md5_p->md_buffer, bytes);
-  md5_get_result(md5_p, signature);
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
 }
 
-/*
- * md5_buffer
- *
- * DESCRIPTION:
- *
- * This function is used to calculate a MD5 signature for a buffer of
- * bytes.  If you only have part of a buffer that you want to process
- * then md5_init, md5_process, and md5_finish should be used.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-void	md5_buffer(const char *buffer, const unsigned int buf_len,
-		   void *signature)
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
 {
-  md5_t		md5;
-
-  /* initialize the computation context */
-  md5_init(&md5);
-
-  /* process whole buffer but last buf_len % MD5_BLOCK bytes */
-  md5_process(&md5, buffer, buf_len);
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* 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;
+	md5_process(pms, pms->buf);
+    }
 
-  /* put result in desired memory area */
-  md5_finish(&md5, signature);
-}
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
 
-/*
- * md5_sig_to_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature in a 16 byte buffer into a hexadecimal string
- * representation.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - a 16 byte buffer that contains the MD5 signature.
- *
- * str - a string of charactes which should be at least 33 bytes long (2
- * characters per MD5 byte and 1 for the \0).
- *
- * str_len - the length of the string.
- */
-void	md5_sig_to_string(void *signature, char *str, const int str_len)
-{
-  unsigned char	*sig_p;
-  char		*str_p, *max_p;
-  unsigned int	high, low;
-  
-  str_p = str;
-  max_p = str + str_len;
-  
-  for (sig_p = (unsigned char *)signature;
-       sig_p < (unsigned char *)signature + MD5_SIZE;
-       sig_p++) {
-    high = *sig_p / 16;
-    low = *sig_p % 16;
-    /* account for 2 chars */
-    if (str_p + 1 >= max_p) {
-      break;
-    }
-    *str_p++ = HEX_STRING[high];
-    *str_p++ = HEX_STRING[low];
-  }
-  /* account for 2 chars */
-  if (str_p < max_p) {
-    *str_p++ = '\0';
-  }
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
 }
 
-/*
- * md5_sig_from_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature from a hexadecimal string representation into
- * a 16 byte buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- *
- * str - A string of charactes which _must_ be at least 32 bytes long (2
- * characters per MD5 byte).
- */
-void	md5_sig_from_string(void *signature, const char *str)
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
 {
-  unsigned char	*sig_p;
-  const char	*str_p;
-  char		*hex;
-  unsigned int	high, low, val;
-  
-  hex = HEX_STRING;
-  sig_p = signature;
-  
-  for (str_p = str; str_p < str + MD5_SIZE * 2; str_p += 2) {
-    high = strchr(hex, *str_p) - hex;
-    low = strchr(hex, *(str_p + 1)) - hex;
-    val = high * 16 + low;
-    *sig_p++ = val;
-  }
+    static const md5_byte_t 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
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
diff --git a/md5/md5.h b/md5/md5.h
index de5ddf39..698c995d 100644
--- a/md5/md5.h
+++ b/md5/md5.h
@@ -1,217 +1,91 @@
 /*
- * Declaration of functions and data types used for MD5 sum computing
- * library functions.  Copyright (C) 1995, 1996 Free Software
- * Foundation, Inc.  NOTE: The canonical source of this file is
- * maintained with the GNU C Library.  Bugs can be reported to
- * bug-glibc@prep.ai.mit.edu.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
 
-/*
- * NOTE: during quick performance tests on a sun ultra and an alpha
- * 255 300, the md5 libraries performed upwards of 3mb/sec.  That
- * included disk i/o on bobcat and panther.
- */
+  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.
 
-#ifndef __MD5_H__
-#define __MD5_H__
+  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:
 
-/*
- * Size of a standard MD5 signature in bytes.  This definition is for
- * external programs only.  The MD5 routines themselves reference the
- * signature as 4 unsigned 32-bit integers.
- */
-#define MD5_SIZE	16
+  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.
 
-/*
- * NOTE: the following is assumed to generate a 32-bit unsigned data
- * type.
- */
-typedef unsigned int		md5_uint32;
-#define MAX_MD5_UINT32		((md5_uint32)4294967295U)
+  L. Peter Deutsch
+  ghost@aladdin.com
 
-/*
- * The MD5 algorithm works on blocks of characters of 64 bytes.  This
- * is an internal value only and is not necessary for external use.
  */
-#define MD5_BLOCK_SIZE		64
-
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
 /*
- * Structure to save state of computation between the single steps.
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
  */
-typedef struct
-{
-  md5_uint32	md_A;			/* accumulater 1 */
-  md5_uint32	md_B;			/* accumulater 2 */
-  md5_uint32	md_C;			/* accumulater 3 */
-  md5_uint32	md_D;			/* accumulater 4 */
-
-  md5_uint32	md_total[2];		/* totaling storage */
-  md5_uint32	md_buf_len;		/* length of the storage buffer */
-  char		md_buffer[MD5_BLOCK_SIZE * 2];	/* character storage buffer */
-} md5_t;
 
-/*<<<<<<<<<<  The below prototypes are auto-generated by fillproto */
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
 
 /*
- * md5_init
- *
- * DESCRIPTION:
- *
- * Initialize structure containing state of MD5 computation. (RFC 1321,
- * 3.3: Step 3).  This is for progressive MD5 calculations only.  If
- * you have the complete string available, md5_buffer should be used.
- * md5_process should be called for each bunch of bytes and after the
- * last process call, md5_finish should be called to get the
- * signature.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to md5 structure that we are initializing.
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
  */
-extern
-void	md5_init(md5_t *md5_p);
 
-/*
- * md5_process
- *
- * DESCRIPTION:
- *
- * This function is used to progressively calculate a MD5 signature some
- * number of bytes at a time.  If you have the complete string
- * available, md5_buffer should be used.  The MD5 structure should
- * have been initialized with md5_init and after the last process
- * call, md5_finish should be called to get the results.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are progressively updating.
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- */
-extern
-void	md5_process(md5_t *md5_p, const void *buffer,
-		    const unsigned int buf_len);
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
 
-/*
- * md5_finish
- *
- * DESCRIPTION:
- *
- * Finish a progressing MD5 calculation and copy the resulting MD5
- * signature into the result buffer which should be 16 bytes
- * (MD5_SIZE).  After this call, the MD5 structure is invalid.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * md5_p - Pointer to MD5 structure which we are finishing.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-extern
-void	md5_finish(md5_t *md5_p, void *signature);
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
 
-/*
- * md5_buffer
- *
- * DESCRIPTION:
- *
- * This function is used to calculate a MD5 signature for a buffer of
- * bytes.  If you only have part of a buffer that you want to process
- * then md5_init, md5_process, and md5_finish should be used.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * buffer - A buffer of bytes whose MD5 signature we are calculating.
- *
- * buf_len - The length of the buffer.
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- */
-extern
-void	md5_buffer(const char *buffer, const unsigned int buf_len,
-		   void *signature);
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
 
-/*
- * md5_sig_to_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature in a 16 byte buffer into a hexadecimal string
- * representation.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - a 16 byte buffer that contains the MD5 signature.
- *
- * str - a string of charactes which should be at least 33 bytes long (2
- * characters per MD5 byte and 1 for the \0).
- *
- * str_len - the length of the string.
- */
-extern
-void	md5_sig_to_string(void *signature, char *str, const int str_len);
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
 
-/*
- * md5_sig_from_string
- *
- * DESCRIPTION:
- *
- * Convert a MD5 signature from a hexadecimal string representation into
- * a 16 byte buffer.
- *
- * RETURNS:
- *
- * None.
- *
- * ARGUMENTS:
- *
- * signature - A 16 byte buffer that will contain the MD5 signature.
- *
- * str - A string of charactes which _must_ be at least 32 bytes long (2
- * characters per MD5 byte).
- */
-extern
-void	md5_sig_from_string(void *signature, const char *str);
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
 
-/*<<<<<<<<<<   This is end of the auto-generated output from fillproto. */
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
 
-#endif /* ! __MD5_H__ */
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
 
+#endif /* md5_INCLUDED */
diff --git a/md5/md5_loc.h b/md5/md5_loc.h
deleted file mode 100644
index c70d965a..00000000
--- a/md5/md5_loc.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Local defines for the md5 functions.
- *
- */
-
-/*
- * 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.
- */
-
-#ifndef __MD5_LOC_H__
-#define __MD5_LOC_H__
-
-#define HEX_STRING	"0123456789abcdef"	/* to convert to hex */
-#define BLOCK_SIZE_MASK	(MD5_BLOCK_SIZE - 1)
-
-
-//#include <config.h>
-
-/*
- * Define my endian-ness.  Could not do in a portable manner using the
- * include files -- grumble.
- */
-#ifdef WORDS_BIGENDIAN
-/*
- * big endian - big is better
- */
-#define SWAP(n)	\
-    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-#else
-/*
-	+ * little endian
-	+ */
-#define SWAP(n)    (n)
-#endif
-
-/*
- * These are the four functions used in the four steps of the MD5
- * algorithm and defined in the RFC 1321.  The first function is a
- * little bit optimized (as found in Colin Plumbs public domain
- * implementation).
- */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d)	(d ^ (b & (c ^ d)))
-#define FG(b, c, d)	FF(d, b, c)
-#define FH(b, c, d)	(b ^ c ^ d)
-#define FI(b, c, d)	(c ^ (b | ~d))
-
-/*
- * It is unfortunate that C does not provide an operator for cyclic
- * rotation.  Hope the C compiler is smart enough.  -- Modified to
- * remove the w = at the front - Gray 2/97
- */
-#define CYCLIC(w, s)	((w << s) | (w >> (32 - s)))
-
-/*
- * First Round: using the given function, the context and a constant
- * the next context is computed.  Because the algorithms processing
- * unit is a 32-bit word and it is determined to work on words in
- * little endian byte order we perhaps have to change the byte order
- * before the computation.  To reduce the work for the next steps we
- * store the swapped words in the array CORRECT_WORDS. -- Modified to
- * fix the handling of unaligned buffer spaces - Gray 7/97
- */
-#define OP1(a, b, c, d, b_p, c_p, s, T)				\
-     do {							\
-       memcpy(c_p, b_p, sizeof(md5_uint32));       		\
-       *c_p = SWAP(*c_p);					\
-       a += FF (b, c, d) + *c_p + T;				\
-       a = CYCLIC (a, s);					\
-       a += b;							\
-       b_p = (char *)b_p + sizeof(md5_uint32);			\
-       c_p++;							\
-    } while (0)
-
-/*
- * Second to Fourth Round: we have the possibly swapped words in
- * CORRECT_WORDS.  Redefine the macro to take an additional first
- * argument specifying the function to use.
- */
-#define OP234(FUNC, a, b, c, d, k, s, T)		\
-    do { 						\
-      a += FUNC (b, c, d) + k + T;			\
-      a = CYCLIC (a, s);				\
-      a += b;						\
-    } while (0)
-
-#endif /* ! __MD5_LOC_H__ */