* md2.c, md2.h, md2-meta.c: New files, implemented md2.

* md4.c, md4.h, md4-meta.c: New files, implemented md4.

Rev: src/nettle/md2-meta.c:1.1
Rev: src/nettle/md2.c:1.1
Rev: src/nettle/md2.h:1.1
Rev: src/nettle/md4-meta.c:1.1
Rev: src/nettle/md4.c:1.1
Rev: src/nettle/md4.h:1.1

md2-meta.c

+/* md2-meta.c */
+
+/* nettle, low-level cryptographics library
+ *
+ * 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
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "nettle-meta.h"
+
+#include "md2.h"
+
+const struct nettle_hash nettle_md2
+= _NETTLE_HASH(md2, MD2);

md2.c

+/* md2.h
+ *
+ * The MD2 hash function. XXX What RFC, if any?
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003 Niels Mller
+ *  
+ * 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 Mller */
+#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);
+}

md2.h

+/* md2.h
+ *
+ * The MD2 hash function. XXX What RFRC, if any?
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003 Niels Mller
+ *  
+ * 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.
+ */
+ 
+#ifndef NETTLE_MD2_H_INCLUDED
+#define NETTLE_MD2_H_INCLUDED
+
+#include <inttypes.h>
+
+/* Name mangling */
+#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);
+
+void
+md2_digest(struct md2_ctx *ctx,
+	   unsigned length,
+	   uint8_t *digest);
+
+
+#endif /* NETTLE_MD2_H_INCLUDED */

md4-meta.c

+/* md4-meta.c */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2002 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
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "nettle-meta.h"
+
+#include "md4.h"
+
+const struct nettle_hash nettle_md4
+= _NETTLE_HASH(md4, MD4);

md4.c

+/* md4.h
+ *
+ * The MD4 hash function. XXX What RFC, if any?
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003 Niels Mller
+ *  
+ * 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.
+ */
+
+/* Adapted from md5 code by Marcus Comstedt */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <string.h>
+
+#include "md4.h"
+
+#include "macros.h"
+
+/* A block, treated as a sequence of 32-bit words. */
+#define MD4_DATA_LENGTH 16
+
+static void
+md4_transform(uint32_t *digest, const uint32_t *data);
+
+static void
+md4_block(struct md4_ctx *ctx, const uint8_t *block);
+
+static void
+md4_final(struct md4_ctx *ctx);
+
+void
+md4_init(struct md4_ctx *ctx)
+{
+  /* Same constants as for md5. */
+  ctx->digest[0] = 0x67452301;
+  ctx->digest[1] = 0xefcdab89;
+  ctx->digest[2] = 0x98badcfe;
+  ctx->digest[3] = 0x10325476;
+  
+  ctx->count_l = ctx->count_h = 0;
+  ctx->index = 0;
+}
+
+void
+md4_update(struct md4_ctx *ctx,
+	   unsigned length,
+	   const uint8_t *data)
+{
+  if (ctx->index)
+    {
+      /* Try to fill partial block */
+      unsigned left = MD4_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);
+	  md4_block(ctx, ctx->block);
+	  data += left;
+	  length -= left;
+	}
+    }
+  while (length >= MD4_DATA_SIZE)
+    {
+      md4_block(ctx, data);
+      data += MD4_DATA_SIZE;
+      length -= MD4_DATA_SIZE;
+    }
+  if ((ctx->index = length))     /* This assignment is intended */
+    /* Buffer leftovers */
+    memcpy(ctx->block, data, length);
+}
+
+void
+md4_digest(struct md4_ctx *ctx,
+	   unsigned length,
+	   uint8_t *digest)
+{
+  unsigned i;
+  unsigned words;
+  unsigned leftover;
+  
+  assert(length <= MD4_DIGEST_SIZE);
+
+  md4_final(ctx);
+  
+  words = length / 4;
+  leftover = length % 4;
+  
+  /* Little endian order */
+  for (i = 0; i < words; i++, digest += 4)
+    LE_WRITE_UINT32(digest, ctx->digest[i]);
+
+  if (leftover)
+    {
+      uint32_t word;
+      unsigned j;
+
+      assert(i < _MD4_DIGEST_LENGTH);
+      
+      /* Still least significant byte first. */
+      for (word = ctx->digest[i], j = 0; j < leftover;
+	   j++, word >>= 8)
+	digest[j] = word & 0xff;
+    }
+  md4_init(ctx);
+}
+
+/* MD4 functions */
+#define F(x, y, z) (((y) & (x)) | ((z) & ~(x)))
+#define G(x, y, z) (((y) & (x)) | ((z) & (x)) | ((y) & (z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+
+#define ROUND(f, w, x, y, z, data, s) \
+( w += f(x, y, z) + data,  w = w<<s | w>>(32-s) )
+
+/* Perform the MD4 transformation on one full block of 16 32-bit words. */
+   
+static void
+md4_transform(uint32_t *digest, const uint32_t *data)
+{
+  uint32_t a, b, c, d;
+  a = digest[0];
+  b = digest[1];
+  c = digest[2];
+  d = digest[3];
+
+  ROUND(F, a, b, c, d, data[ 0], 3);
+  ROUND(F, d, a, b, c, data[ 1], 7);
+  ROUND(F, c, d, a, b, data[ 2], 11);
+  ROUND(F, b, c, d, a, data[ 3], 19);
+  ROUND(F, a, b, c, d, data[ 4], 3);
+  ROUND(F, d, a, b, c, data[ 5], 7);
+  ROUND(F, c, d, a, b, data[ 6], 11);
+  ROUND(F, b, c, d, a, data[ 7], 19);
+  ROUND(F, a, b, c, d, data[ 8], 3);
+  ROUND(F, d, a, b, c, data[ 9], 7);
+  ROUND(F, c, d, a, b, data[10], 11);
+  ROUND(F, b, c, d, a, data[11], 19);
+  ROUND(F, a, b, c, d, data[12], 3);
+  ROUND(F, d, a, b, c, data[13], 7);
+  ROUND(F, c, d, a, b, data[14], 11);
+  ROUND(F, b, c, d, a, data[15], 19);
+
+  ROUND(G, a, b, c, d, data[ 0] + 0x5a827999, 3);
+  ROUND(G, d, a, b, c, data[ 4] + 0x5a827999, 5);
+  ROUND(G, c, d, a, b, data[ 8] + 0x5a827999, 9);
+  ROUND(G, b, c, d, a, data[12] + 0x5a827999, 13);
+  ROUND(G, a, b, c, d, data[ 1] + 0x5a827999, 3);
+  ROUND(G, d, a, b, c, data[ 5] + 0x5a827999, 5);
+  ROUND(G, c, d, a, b, data[ 9] + 0x5a827999, 9);
+  ROUND(G, b, c, d, a, data[13] + 0x5a827999, 13);
+  ROUND(G, a, b, c, d, data[ 2] + 0x5a827999, 3);
+  ROUND(G, d, a, b, c, data[ 6] + 0x5a827999, 5);
+  ROUND(G, c, d, a, b, data[10] + 0x5a827999, 9);
+  ROUND(G, b, c, d, a, data[14] + 0x5a827999, 13);
+  ROUND(G, a, b, c, d, data[ 3] + 0x5a827999, 3);
+  ROUND(G, d, a, b, c, data[ 7] + 0x5a827999, 5);
+  ROUND(G, c, d, a, b, data[11] + 0x5a827999, 9);
+  ROUND(G, b, c, d, a, data[15] + 0x5a827999, 13);
+
+  ROUND(H, a, b, c, d, data[ 0] + 0x6ed9eba1, 3);
+  ROUND(H, d, a, b, c, data[ 8] + 0x6ed9eba1, 9);
+  ROUND(H, c, d, a, b, data[ 4] + 0x6ed9eba1, 11);
+  ROUND(H, b, c, d, a, data[12] + 0x6ed9eba1, 15);
+  ROUND(H, a, b, c, d, data[ 2] + 0x6ed9eba1, 3);
+  ROUND(H, d, a, b, c, data[10] + 0x6ed9eba1, 9);
+  ROUND(H, c, d, a, b, data[ 6] + 0x6ed9eba1, 11);
+  ROUND(H, b, c, d, a, data[14] + 0x6ed9eba1, 15);
+  ROUND(H, a, b, c, d, data[ 1] + 0x6ed9eba1, 3);
+  ROUND(H, d, a, b, c, data[ 9] + 0x6ed9eba1, 9);
+  ROUND(H, c, d, a, b, data[ 5] + 0x6ed9eba1, 11);
+  ROUND(H, b, c, d, a, data[13] + 0x6ed9eba1, 15);
+  ROUND(H, a, b, c, d, data[ 3] + 0x6ed9eba1, 3);
+  ROUND(H, d, a, b, c, data[11] + 0x6ed9eba1, 9);
+  ROUND(H, c, d, a, b, data[ 7] + 0x6ed9eba1, 11);
+  ROUND(H, b, c, d, a, data[15] + 0x6ed9eba1, 15);
+
+  digest[0] += a;
+  digest[1] += b;
+  digest[2] += c;
+  digest[3] += d;
+}
+
+static void
+md4_block(struct md4_ctx *ctx, const uint8_t *block)
+{
+  uint32_t data[MD4_DATA_LENGTH];
+  unsigned i;
+  
+  /* Update block count */
+  if (!++ctx->count_l)
+    ++ctx->count_h;
+
+  /* Endian independent conversion */
+  for (i = 0; i<16; i++, block += 4)
+    data[i] = LE_READ_UINT32(block);
+
+  md4_transform(ctx->digest, data);
+}
+
+/* Final wrapup - pad to MD4_DATA_SIZE-byte boundary with the bit
+ * pattern 1 0* (64-bit count of bits processed, LSB-first) */
+
+static void
+md4_final(struct md4_ctx *ctx)
+{
+  uint32_t data[MD4_DATA_LENGTH];
+  unsigned i;
+  unsigned words;
+  
+  i = ctx->index;
+
+  /* Set the first char of padding to 0x80. This is safe since there
+   * is always at least one byte free */
+  assert(i < MD4_DATA_SIZE);
+  ctx->block[i++] = 0x80;
+
+  /* Fill rest of word */
+  for( ; i & 3; i++)
+    ctx->block[i] = 0;
+
+  /* i is now a multiple of the word size 4 */
+  words = i >> 2;
+  for (i = 0; i < words; i++)
+    data[i] = LE_READ_UINT32(ctx->block + 4*i);
+  
+  if (words > (MD4_DATA_LENGTH-2))
+    { /* No room for length in this block. Process it and
+       * pad with another one */
+      for (i = words ; i < MD4_DATA_LENGTH; i++)
+	data[i] = 0;
+      md4_transform(ctx->digest, data);
+      for (i = 0; i < (MD4_DATA_LENGTH-2); i++)
+	data[i] = 0;
+    }
+  else
+    for (i = words ; i < MD4_DATA_LENGTH - 2; i++)
+      data[i] = 0;
+  
+  /* There are 512 = 2^9 bits in one block 
+   * Little-endian order => Least significant word first */
+
+  data[MD4_DATA_LENGTH-1] = (ctx->count_h << 9) | (ctx->count_l >> 23);
+  data[MD4_DATA_LENGTH-2] = (ctx->count_l << 9) | (ctx->index << 3);
+  md4_transform(ctx->digest, data);
+}

md4.h

+/* md4.h
+ *
+ * The MD4 hash function. XXX What RFRC, if any?
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003 Niels Mller
+ *  
+ * 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.
+ */
+ 
+#ifndef NETTLE_MD4_H_INCLUDED
+#define NETTLE_MD4_H_INCLUDED
+
+#include <inttypes.h>
+
+/* Name mangling */
+#define md4_init nettle_md4_init
+#define md4_update nettle_md4_update
+#define md4_digest nettle_md4_digest
+
+#define MD4_DIGEST_SIZE 16
+#define MD4_DATA_SIZE 64
+
+/* Digest is kept internally as 4 32-bit words. */
+#define _MD4_DIGEST_LENGTH 4
+
+struct md4_ctx
+{
+  uint32_t digest[_MD4_DIGEST_LENGTH];
+  uint32_t count_l, count_h;    /* Block count */
+  uint8_t block[MD4_DATA_SIZE]; /* Block buffer */
+  unsigned index;               /* Into buffer */
+};
+
+void
+md4_init(struct md4_ctx *ctx);
+
+void
+md4_update(struct md4_ctx *ctx,
+	   unsigned length,
+	   const uint8_t *data);
+
+void
+md4_digest(struct md4_ctx *ctx,
+	   unsigned length,
+	   uint8_t *digest);
+
+
+#endif /* NETTLE_MD4_H_INCLUDED */