Remove md5-compat (not used).

6 files changed, 209 insertions, 99 deletions

diff --git a/nettle/Makefile.am b/nettle/Makefile.am
index 6753a4adca..3da6a3dbb1 100644
--- a/nettle/Makefile.am
+++ b/nettle/Makefile.am
@@ -38,7 +38,7 @@ libnettle_la_SOURCES = aes.c aes.h aes-internal.h \
 		      des3.c des-compat.c des-compat.h \
 		      hmac.c hmac.h hmac-md5.c hmac-sha1.c \
 		      knuth-lfib.h knuth-lfib.c \
-		      md5.c md5.h md5-compat.c md5-compat.h md5-meta.c \
+		      md5.c md5.h md5-meta.c \
 		      sha.h sha1.c sha1-compress.c sha1-meta.c \
 		      nettle-meta.h \
 		      nettle-internal.c nettle-internal.h \
diff --git a/nettle/md5-compat.c b/nettle/md2-meta.c
index 31a2fd51b2..0ed0b470cf 100644
--- a/nettle/md5-compat.c
+++ b/nettle/md2-meta.c
@@ -1,11 +1,8 @@
-/* md5-compat.c
- *
- * The md5 hash function, RFC 1321-style interface.
- */
+/* md2-meta.c */
 
 /* nettle, low-level cryptographics library
  *
- * Copyright (C) 2001 Niels Möller
+ * Copyright (C) 2003 Niels Möller
  *  
  * The nettle library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -27,22 +24,9 @@
 # include "config.h"
 #endif
 
-#include "md5-compat.h"
-
-void
-MD5Init(MD5_CTX *ctx)
-{
-  md5_init(ctx);
-}
+#include "nettle-meta.h"
 
-void
-MD5Update(MD5_CTX *ctx, const unsigned char *data, unsigned int length)
-{
-  md5_update(ctx, length, data);
-}
+#include "md2.h"
 
-void
-MD5Final(unsigned char *out, MD5_CTX *ctx)
-{
-  md5_digest(ctx, MD5_DIGEST_SIZE, out);
-}
+const struct nettle_hash nettle_md2
+= _NETTLE_HASH(md2, MD2);
diff --git a/nettle/md2.c b/nettle/md2.c
new file mode 100644
index 0000000000..ae2abb56ac
--- /dev/null
+++ b/nettle/md2.c
@@ -0,0 +1,167 @@
+/* md2.h
+ *
+ * The MD2 hash function, described in RFC 1319.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003 Niels Möller, Andreas Sigfridsson
+ *  
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * The nettle library 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 Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+/* This code originates from the Python Cryptography Toolkit, version 1.0.1.
+   Further hacked by Andreas Sigfridsson and Niels Möller. Original license:
+
+   ===================================================================
+   Distribute and use freely; there are no restrictions on further
+   dissemination and usage except those imposed by the laws of your
+   country of residence.  This software is provided "as is" without
+   warranty of fitness for use or suitability for any purpose, express
+   or implied. Use at your own risk or not at all.
+   ===================================================================
+   
+   Incorporating the code into commercial products is permitted; you do
+   not have to make source available or contribute your changes back
+   (though that would be nice).
+   
+   --amk                                                    (www.amk.ca) */
+   
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <string.h>
+
+#include "md2.h"
+
+#include "macros.h"
+
+static const uint8_t
+S[256] = {
+  41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
+  19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
+  76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
+  138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
+  245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
+  148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
+  39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
+  181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
+  150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
+  112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
+  96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
+  85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
+  234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
+  129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
+  8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
+  203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
+  166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
+  31, 26, 219, 153, 141, 51, 159, 17, 131, 20
+};
+
+static void
+md2_transform(struct md2_ctx *ctx, const uint8_t *data)
+{
+  unsigned i;
+  uint8_t t;
+  
+  memcpy(ctx->X + 16, data, MD2_DATA_SIZE);
+
+  for (i = 0, t = ctx->C[15];
+       i<MD2_DATA_SIZE; i++)
+    {
+      ctx->X[2 * MD2_DATA_SIZE + i]
+	= ctx->X[i] ^ ctx->X[MD2_DATA_SIZE + i];
+      t = (ctx->C[i] ^= S[data[i]^t]);
+    }
+  for (i = t = 0;
+       i< MD2_DATA_SIZE + 2;
+       t = (t + i) & 0xff, i++)
+    {
+      unsigned j;
+      for (j = 0; j < 3 * MD2_DATA_SIZE; j++)
+	t = (ctx->X[j] ^= S[t]);
+    }
+}
+
+#if 0
+static void
+md2_final(struct md2_ctx *ctx)
+{
+  unsigned left = MD2_DATA_SIZE - ctx->index;
+  memset(ctx->block + ctx->index, left, left);
+  md2_transform(ctx, ctx->block);
+}
+#endif
+
+void
+md2_init(struct md2_ctx *ctx)
+{
+  memset(ctx, 0, sizeof(*ctx));
+}
+
+void
+md2_update(struct md2_ctx *ctx,
+	   unsigned length,
+	   const uint8_t *data)
+{
+  if (ctx->index)
+    {
+      /* Try to fill partial block */
+      unsigned left = MD2_DATA_SIZE - ctx->index;
+      if (length < left)
+	{
+	  memcpy(ctx->block + ctx->index, data, length);
+	  ctx->index += length;
+	  return; /* Finished */
+	}
+      else
+	{
+	  memcpy(ctx->block + ctx->index, data, left);
+	  md2_transform(ctx, ctx->block);
+	  data += left;
+	  length -= left;
+	}
+    }
+  while (length >= MD2_DATA_SIZE)
+    {
+      md2_transform(ctx, data);
+      data += MD2_DATA_SIZE;
+      length -= MD2_DATA_SIZE;
+    }
+  if ((ctx->index = length))     /* This assignment is intended */
+    /* Buffer leftovers */
+    memcpy(ctx->block, data, length);
+}
+
+void
+md2_digest(struct md2_ctx *ctx,
+	   unsigned length,
+	   uint8_t *digest)
+{
+  unsigned left;
+  
+  assert(length <= MD2_DIGEST_SIZE);
+
+  left = MD2_DATA_SIZE - ctx->index;
+  memset(ctx->block + ctx->index, left, left);
+  md2_transform(ctx, ctx->block);
+  
+  md2_transform(ctx, ctx->C);
+  memcpy(digest, ctx->X, length);
+  md2_init(ctx);
+}
diff --git a/nettle/md5-compat.h b/nettle/md2.h
index 32925d09be..2fbfbbccd0 100644
--- a/nettle/md5-compat.h
+++ b/nettle/md2.h
@@ -1,11 +1,11 @@
-/* md5-compat.h
+/* md2.h
  *
- * The md5 hash function, RFC 1321-style interface.
+ * The MD2 hash function, described in RFC 1319.
  */
 
 /* nettle, low-level cryptographics library
  *
- * Copyright (C) 2001 Niels Möller
+ * Copyright (C) 2003 Niels Möller
  *  
  * The nettle library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,21 +22,40 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
+ 
+#ifndef NETTLE_MD2_H_INCLUDED
+#define NETTLE_MD2_H_INCLUDED
 
-#ifndef NETTLE_MD5_COMPAT_H_INCLUDED
-#define NETTLE_MD5_COMPAT_H_INCLUDED
-
-#include "md5.h"
+#include "nettle-types.h"
 
 /* Name mangling */
-#define MD5Init nettle_MD5Init
-#define MD5Update nettle_MD5Update
-#define MD5Final nettle_MD5Final
+#define md2_init nettle_md2_init
+#define md2_update nettle_md2_update
+#define md2_digest nettle_md2_digest
+
+#define MD2_DIGEST_SIZE 16
+#define MD2_DATA_SIZE 16
+
+struct md2_ctx
+{
+  uint8_t C[MD2_DATA_SIZE];
+  uint8_t X[3 * MD2_DATA_SIZE];
+  uint8_t block[MD2_DATA_SIZE]; /* Block buffer */
+  unsigned index;               /* Into buffer */
+};
+
+void
+md2_init(struct md2_ctx *ctx);
+
+void
+md2_update(struct md2_ctx *ctx,
+	   unsigned length,
+	   const uint8_t *data);
 
-typedef struct md5_ctx MD5_CTX;
+void
+md2_digest(struct md2_ctx *ctx,
+	   unsigned length,
+	   uint8_t *digest);
 
-void MD5Init(MD5_CTX *ctx);
-void MD5Update(MD5_CTX *ctx, const unsigned char *data, unsigned int length);
-void MD5Final(unsigned char *out, MD5_CTX *ctx);
 
-#endif /* NETTLE_MD5_COMPAT_H_INCLUDED */
+#endif /* NETTLE_MD2_H_INCLUDED */
diff --git a/nettle/tests/Makefile.am b/nettle/tests/Makefile.am
index c8e4ea3327..8aa87e9ac3 100644
--- a/nettle/tests/Makefile.am
+++ b/nettle/tests/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_PROGRAMS = aes-test arcfour-test arctwo-test \
 	   des-test des3-test des-compat-test \
-	   md5-test md5-compat-test \
+	   md5-test \
 	   sha1-test \
 	   knuth-lfib-test \
 	   cbc-test hmac-test
diff --git a/nettle/tests/md5-compat-test.c b/nettle/tests/md5-compat-test.c
deleted file mode 100644
index bffb6232e5..0000000000
--- a/nettle/tests/md5-compat-test.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "testutils.h"
-#include "md5-compat.h"
-
-int
-test_main(void)
-{
-  MD5_CTX ctx;
-  unsigned char digest[MD5_DIGEST_SIZE];
-
-  MD5Init(&ctx);
-  MD5Final(digest, &ctx);
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("D41D8CD98F00B204 E9800998ECF8427E")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "a", 1);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("0CC175B9C0F1B6A8 31C399E269772661")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "abc", 3);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("900150983cd24fb0 D6963F7D28E17F72")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "message digest", 14);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("F96B697D7CB7938D 525A2F31AAF161D0")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "abcdefghijklmnopqrstuvwxyz", 26);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("C3FCD3D76192E400 7DFB496CCA67E13B")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("D174AB98D277D9F5 A5611C2C9F419D9F")))
-    FAIL();
-
-  MD5Init(&ctx);
-  MD5Update(&ctx, "1234567890123456789012345678901234567890"
-	    "1234567890123456789012345678901234567890",
-	    80);
-  MD5Final(digest, &ctx);
-
-  if (!MEMEQ(MD5_DIGEST_SIZE, digest, H("57EDF4A22BE3C955 AC49DA2E2107B67A")))
-    FAIL();
-
-  SUCCESS();
-}