Add in a libcrypt implementation. About 8k.

 -Erik

4 files changed, 916 insertions, 0 deletions

diff --git a/libcrypt/Makefile b/libcrypt/Makefile
new file mode 100644
index 000000000..78deb14a4
--- /dev/null
+++ b/libcrypt/Makefile
@@ -0,0 +1,57 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000 by Lineo, inc.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, 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 Library General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Library 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
+#
+# Derived in part from the Linux-8086 C library, the GNU C Library, and several
+# other sundry sources.  Files within this library are copyright by their
+# respective copyright holders.
+
+TOPDIR=../
+include $(TOPDIR)Rules.mak
+LIBCRYPT=libcrypt.a
+SHARED_NAME=libcrypt.so.1
+APP_CC= ../extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
+
+CSRC = crypt.c des.c md5.c
+COBJS=$(patsubst %.c,%.o, $(CSRC))
+
+
+OBJS=$(COBJS)
+
+all: $(OBJS) $(LIBCRYPT) shared
+
+$(LIBCRYPT): ar-target
+
+ar-target: $(OBJS)
+	$(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
+
+$(COBJS): %.o : %.c
+	$(APP_CC) $(CFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(OBJ): Makefile
+
+shared: $(LIBCRYPT)
+	$(APP_CC) $(LDFLAGS) -shared -o $(SHARED_NAME) \
+	    -Wl,-soname,$(SHARED_NAME) $(COBJS) $(TOPDIR)libuClibc.so.1
+
+clean: 
+	rm -f *.[oa] *~ core $(SHARED_NAME)
+
+.PHONY: dummy
+
+
diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
new file mode 100644
index 000000000..13d8efca5
--- /dev/null
+++ b/libcrypt/crypt.c
@@ -0,0 +1,44 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * crypt() for uClibc
+ *
+ * Copyright (C) 2001 by Lineo, inc.  Written by 
+ *  Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, 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 Library General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Library 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
+ *
+ */
+
+#include <crypt.h>
+#include <unistd.h>
+
+/* For use by the old, non-reentrant routines (crypt/encrypt/setkey)  */
+static struct crypt_data __crypt_data;
+
+char * crypt(const char *key, const char *salt)
+{
+    return crypt_r (key, salt, &__crypt_data);
+}
+
+void setkey(const char *key)
+{
+    return setkey_r(key, &__crypt_data);
+}
+
+void encrypt(char *block, int edflag)
+{
+    return encrypt_r(block, edflag, &__crypt_data);
+}
+
diff --git a/libcrypt/des.c b/libcrypt/des.c
new file mode 100644
index 000000000..e8a77c168
--- /dev/null
+++ b/libcrypt/des.c
@@ -0,0 +1,330 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2001 by Rene Müller
+ *      DES based crypt() implementation, originally written for dietlibc by 
+ *      Rene Müller, based on Bruce Schneier's Applied Cryptography, but 
+ *      tightened up quite a bit.
+ *
+ * Copyright (C) 2001 by Erik Andersen 
+ *      Adjusted each function to be reentrant, hacked in md5 support.
+ *
+ * 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 of the License, 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
+ *
+ */
+
+
+
+#include <crypt.h>
+#include <string.h>
+#include <unistd.h>
+
+extern char *md5_magic;
+extern char * md5_crypt_r( const char *pw, const char *salt, struct crypt_data * data);
+
+/* Initial permutation, */
+static const char IP[] = {
+  57,49,41,33,25,17, 9, 1,
+  59,51,43,35,27,19,11, 3,
+  61,53,45,37,29,21,13, 5,
+  63,55,47,39,31,23,15, 7,
+  56,48,40,32,24,16, 8, 0,
+  58,50,42,34,26,18,10, 2,
+  60,52,44,36,28,20,12, 4,
+  62,54,46,38,30,22,14, 6
+};
+
+/* Final permutation, FP = IP^(-1) */
+static const char FP[] = {
+  39, 7,47,15,55,23,63,31,
+  38, 6,46,14,54,22,62,30,
+  37, 5,45,13,53,21,61,29,
+  36, 4,44,12,52,20,60,28,
+  35, 3,43,11,51,19,59,27,
+  34, 2,42,10,50,18,58,26,
+  33, 1,41, 9,49,17,57,25,
+  32, 0,40, 8,48,16,56,24
+};
+
+/* Permuted-choice 1 from the key bits to yield C and D.
+ * Note that bits 8,16... are left out: They are intended for a parity check.
+ */
+static const char PC1_C[] = {
+  56,48,40,32,24,16, 8,
+   0,57,49,41,33,25,17,
+   9, 1,58,50,42,34,26,
+  18,10, 2,59,51,43,35
+};
+
+static const char PC1_D[] = {
+  62,54,46,38,30,22,14,
+   6,61,53,45,37,29,21,
+  13, 5,60,52,44,36,28,
+  20,12, 4,27,19,11, 3
+};
+
+/* Sequence of shifts used for the key schedule. */
+static const char shifts[] = { 1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1 };
+
+/*
+ * Permuted-choice 2, to pick out the bits from the CD array that generate
+ * the key schedule.
+ */
+static const char PC2_C[] = {
+  13, 16, 10, 23,  0,  4,  2, 27, 14,  5, 20,  9,
+  22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1
+};
+
+static const char PC2_D[] = {
+  12, 23,  2,  8, 18, 26,  1, 11, 22, 16,  4, 19,
+  15, 20, 10, 27,  5, 24, 17, 13, 21,  7,  0,  3
+};
+
+static const char e2[] = {
+  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
+   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
+  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
+  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
+};
+
+/* The 8 selection functions. For some reason, they give a 0-origin index,
+ * unlike everything else.
+ */
+static const char S[8][64] = {
+  {
+    14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
+     0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
+     4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
+    15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13
+  },
+
+  {
+    15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
+     3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
+     0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
+    13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9
+  },
+
+  {
+    10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
+    13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
+    13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
+     1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12
+  },
+
+  {
+     7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
+    13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
+    10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
+     3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14
+  },
+
+  {
+     2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
+    14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
+     4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
+    11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3
+  },
+
+  {
+    12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
+    10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
+     9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
+     4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13
+  },
+
+  {
+     4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
+    13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
+     1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
+     6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12
+  },
+
+  {
+    13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
+     1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
+     7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
+     2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11
+  }
+};
+
+/* P is a permutation on the selected combination of the current L and key. */
+static const char P[] = {
+  15, 6,19,20, 28,11,27,16,  0,14,22,25,  4,17,30, 9,
+   1, 7,23,13, 31,26, 2, 8, 18,12,29, 5, 21,10, 3,24
+};
+
+/* Set up the key schedule from the key. */
+void setkey_r(const char *key, struct crypt_data *data)
+{
+  register int i, j, k;
+  int  t;
+  int  s;
+
+  /* First, generate C and D by permuting the key.  The low order bit of each
+   * 8-bit char is not used, so C and D are only 28 bits apiece.
+   */
+  for(i=0; i < 28; i++) {
+    data->C[i] = key[(int)PC1_C[i]];
+    data->D[i] = key[(int)PC1_D[i]];
+  }
+  /* To generate Ki, rotate C and D according to schedule and pick up a
+   * permutation using PC2.
+   */
+  for(i=0; i < 16; i++) {
+    /* rotate. */
+    s = shifts[i];
+    for(k=0; k < s; k++) {
+      t = data->C[0];
+      for(j=0; j < 27; j++)
+	data->C[j] = data->C[j+1];
+      data->C[27] = t;
+      t = data->D[0];
+      for(j=0; j < 27; j++)
+	data->D[j] = data->D[j+1];
+      data->D[27] = t;
+    }
+    /* get Ki. Note C and D are concatenated. */
+    for(j=0; j < 24; j++) {
+      data->KS[i][j] = data->C[(int)PC2_C[j]];
+      data->KS[i][j+24] = data->D[(int)PC2_D[j]];
+    }
+  }
+
+  for(i=0; i < 48; i++)
+    data->E[i] = e2[i];
+}
+
+
+/* The payoff: encrypt a block. */
+void encrypt_r(char block[64], int edflag, struct crypt_data *data)
+{
+  int  i, ii;
+  register int t, j, k;
+
+  /* First, permute the bits in the input */
+  for(j=0; j < 64; j++)
+    data->L[j] = data->block[(int)IP[j]];
+  /* Perform an encryption operation 16 times. */
+  for(ii=0; ii < 16; ii++) {
+    i = ii;
+    /* Save the R array, which will be the new L. */
+    for(j=0; j < 32; j++)
+      data->tempL[j] = data->R[j];
+    /* Expand R to 48 bits using the E selector;
+     * exclusive-or with the current key bits.
+     */
+    for(j=0; j < 48; j++)
+      data->preS[j] = data->R[data->E[j]-1] ^ data->KS[i][j];
+    /* The pre-select bits are now considered in 8 groups of 6 bits each.
+     * The 8 selection functions map these 6-bit quantities into 4-bit
+     * quantities and the results permuted to make an f(R, K).
+     * The indexing into the selection functions is peculiar;
+     * it could be simplified by rewriting the tables.
+     */
+    for(j=0; j < 8; j++) {
+      t = ((j<<1)+j)<<1;
+      k = S[j][(data->preS[t]<<5)+
+	 (data->preS[t+1]<<3)+
+	 (data->preS[t+2]<<2)+
+	 (data->preS[t+3]<<1)+
+	 (data->preS[t+4]   )+
+	 (data->preS[t+5]<<4)];
+      t = j << 2;
+      data->f[t  ] = (k>>3)&01;
+      data->f[t+1] = (k>>2)&01;
+      data->f[t+2] = (k>>1)&01;
+      data->f[t+3] = (k   )&01;
+    }
+    /* The new R is L ^ f(R, K). The f here has to be permuted first, though. */
+    for(j=0; j < 32; j++)
+      data->R[j] = data->L[j] ^ data->f[(int)P[j]];
+    /* Finally, the new L (the original R) is copied back. */
+    for(j=0; j < 32; j++)
+      data->L[j] = data->tempL[j];
+  }
+  /* The output L and R are reversed. */
+  for(j=0; j < 32; j++) {
+    data->L[j] ^= data->R[j];
+    data->R[j] ^= data->L[j];
+    data->L[j] ^= data->R[j];
+  }
+  /* The final output gets the inverse permutation of the very original. */
+  for(j=0; j < 64; j++)
+    data->block[j] = data->L[(int)FP[j]];
+}
+
+char * crypt_r(const char *pw, const char *salt, struct crypt_data *data)
+{
+  register int i, j, c;
+  
+  
+  /* Check if we are supposed to be using the MD5 encryption replacement.  */
+  if (strncmp (md5_magic, salt, sizeof (md5_magic) - 1) == 0)
+    return md5_crypt_r(pw, salt, data);
+
+  for(i=0; i < 66; i++)
+    data->block[i] = 0;
+  for(i=0; (c= *pw) && i < 64; pw++) {
+    for(j=0; j < 7; j++, i++)
+      data->block[i] = (c>>(6-j)) & 01;
+    i++;
+  }
+
+  setkey_r(data->block, data);
+
+  for(i=0; i < 66; i++)
+    data->block[i] = 0;
+
+  for(i=0; i < 2; i++) {
+    c = *salt++;
+    data->iobuf[i] = c;
+    if(c > 'Z')
+      c -= 6;
+    if(c > '9')
+      c -= 7;
+    c -= '.';
+    for(j=0; j < 6; j++) {
+      if((c>>j) & 01) {
+	int ind1 = (((i<<1)+i)<< 1) + j;
+	int ind2 = ind1 + 24;
+	data->E[ind1] ^= data->E[ind2];
+	data->E[ind2] ^= data->E[ind1];
+	data->E[ind1] ^= data->E[ind2];
+      }
+    }
+  }
+
+  for(i=0; i < 25; i++)
+    encrypt_r(data->block, 0, data);
+
+  for(i=0; i < 11; i++) {
+    c = 0;
+    for(j=0; j < 6; j++) {
+      c <<= 1;
+      c |= data->block[(((i<<1)+i)<<1)+j];
+    }
+    c += '.';
+    if(c > '9')
+      c += 7;
+    if(c > 'Z')
+      c += 6;
+    data->iobuf[i+2] = c;
+  }
+  data->iobuf[i+2] = 0;
+  if(data->iobuf[1] == 0)
+    data->iobuf[1] = data->iobuf[0];
+  return(data->iobuf);
+}
+
diff --git a/libcrypt/md5.c b/libcrypt/md5.c
new file mode 100644
index 000000000..104e5a8dd
--- /dev/null
+++ b/libcrypt/md5.c
@@ -0,0 +1,485 @@
+/*
+ * 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.
+ *
+ * $FreeBSD: src/lib/libmd/md5c.c,v 1.9.2.1 1999/08/29 14:57:12 peter Exp $
+ *
+ * This code is the same as the code published by RSA Inc.  It has been
+ * edited for clarity and style only.
+ *
+ * ----------------------------------------------------------------------------
+ * The md5_crypt() function was taken from freeBSD's libcrypt and contains 
+ * this license: 
+ *    "THE BEER-WARE LICENSE" (Revision 42):
+ *     <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ *     can do whatever you want with this stuff. If we meet some day, and you think
+ *     this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+ *
+ * $FreeBSD: src/lib/libcrypt/crypt.c,v 1.7.2.1 1999/08/29 14:56:33 peter Exp $
+ *
+ * ----------------------------------------------------------------------------
+ * On April 19th, 2001 md5_crypt() was modified to make it reentrant 
+ * by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ *
+ */
+
+#include <sys/types.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <crypt.h>
+#include <sys/cdefs.h>
+	
+/* MD5 context. */
+typedef struct MD5Context {
+  u_int32_t state[4];	/* state (ABCD) */
+  u_int32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];	/* input buffer */
+} MD5_CTX;
+
+void   MD5Init (MD5_CTX *);
+void   MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
+void   MD5Pad (MD5_CTX *);
+void   MD5Final (unsigned char [16], MD5_CTX *);
+char * MD5End(MD5_CTX *, char *);
+char * MD5File(const char *, char *);
+char * MD5Data(const unsigned char *, unsigned int, char *);
+char * md5_crypt_r( const char *pw, const char *salt, struct crypt_data * data);
+
+
+char	*md5_magic = "$1$";	/* * This string is magic for this algorithm.  Having 
+				   it this way, we can get better later on */
+static const unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+
+static void MD5Transform __P((u_int32_t [4], const unsigned char [64]));
+
+#ifdef KERNEL
+#define memset(x,y,z)	bzero(x,z);
+#define memcpy(x,y,z)	bcopy(y, x, z)
+#endif
+
+#ifdef i386
+#define Encode memcpy
+#define Decode memcpy
+#else /* i386 */
+
+/*
+ * Encodes input (u_int32_t) into output (unsigned char). Assumes len is
+ * a multiple of 4.
+ */
+
+static void
+Encode (output, input, len)
+	unsigned char *output;
+	u_int32_t *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 (u_int32_t). Assumes len is
+ * a multiple of 4.
+ */
+
+static void
+Decode (output, input, len)
+	u_int32_t *output;
+	const unsigned char *input;
+	unsigned int len;
+{
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4)
+		output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) |
+		    (((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24);
+}
+#endif /* i386 */
+
+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) + (u_int32_t)(ac); \
+	(a) = ROTATE_LEFT ((a), (s)); \
+	(a) += (b); \
+	}
+#define GG(a, b, c, d, x, s, ac) { \
+	(a) += G ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
+	(a) = ROTATE_LEFT ((a), (s)); \
+	(a) += (b); \
+	}
+#define HH(a, b, c, d, x, s, ac) { \
+	(a) += H ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
+	(a) = ROTATE_LEFT ((a), (s)); \
+	(a) += (b); \
+	}
+#define II(a, b, c, d, x, s, ac) { \
+	(a) += I ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
+	(a) = ROTATE_LEFT ((a), (s)); \
+	(a) += (b); \
+	}
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context. */
+
+void MD5Init (MD5_CTX *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 ( MD5_CTX *context, const unsigned char *input, unsigned int inputLen)
+{
+	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] += ((u_int32_t)inputLen << 3))
+	    < ((u_int32_t)inputLen << 3))
+		context->count[1]++;
+	context->count[1] += ((u_int32_t)inputLen >> 29);
+
+	partLen = 64 - index;
+
+	/* Transform as many times as possible. */
+	if (inputLen >= partLen) {
+		memcpy((void *)&context->buffer[index], (const void *)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 */
+	memcpy ((void *)&context->buffer[index], (const void *)&input[i],
+	    inputLen-i);
+}
+
+/*
+ * MD5 padding. Adds padding followed by original length.
+ */
+
+void MD5Pad ( MD5_CTX *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);
+}
+
+/*
+ * MD5 finalization. Ends an MD5 message-digest operation, writing the
+ * the message digest and zeroizing the context.
+ */
+
+void MD5Final ( unsigned char digest[16], MD5_CTX *context)
+{
+	/* Do padding. */
+	MD5Pad (context);
+
+	/* Store state in digest */
+	Encode (digest, context->state, 16);
+
+	/* Zeroize sensitive information. */
+	memset ((void *)context, 0, sizeof (*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block. */
+
+static void
+MD5Transform (state, block)
+	u_int32_t state[4];
+	const unsigned char block[64];
+{
+	u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+	Decode (x, block, 64);
+
+	/* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+	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 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+	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 */
+	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 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+	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 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+	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. */
+	memset ((void *)x, 0, sizeof (x));
+}
+
+
+static void to64( char *s, unsigned long v, int n)
+{
+	while (--n >= 0) {
+		*s++ = itoa64[v&0x3f];
+		v >>= 6;
+	}
+}
+
+/*
+ * UNIX password
+ *
+ * Use MD5 for what it is best at...
+ */
+
+char * md5_crypt_r( const char *pw, const char *salt, struct crypt_data * data)
+{
+	char *p = data->p;
+	const char *sp = data->sp;
+	const char *ep = data->ep;
+	char *passwd = *data->KS;
+	unsigned char	final[16];
+	int sl,pl,i;
+	MD5_CTX	ctx,ctx1;
+	unsigned long l;
+
+	/* Refine the Salt first */
+	sp = salt;
+
+	/* If it starts with the magic string, then skip that */
+	if(!strncmp(sp,md5_magic,strlen(md5_magic)))
+		sp += strlen(md5_magic);
+
+	/* It stops at the first '$', max 8 chars */
+	for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+		continue;
+
+	/* get the length of the true salt */
+	sl = ep - sp;
+
+	MD5Init(&ctx);
+
+	/* The password first, since that is what is most unknown */
+	MD5Update(&ctx,pw,strlen(pw));
+
+	/* Then our magic string */
+	MD5Update(&ctx,md5_magic,strlen(md5_magic));
+
+	/* Then the raw salt */
+	MD5Update(&ctx,sp,sl);
+
+	/* Then just as many characters of the MD5(pw,salt,pw) */
+	MD5Init(&ctx1);
+	MD5Update(&ctx1,pw,strlen(pw));
+	MD5Update(&ctx1,sp,sl);
+	MD5Update(&ctx1,pw,strlen(pw));
+	MD5Final(final,&ctx1);
+	for(pl = strlen(pw); pl > 0; pl -= 16)
+		MD5Update(&ctx,final,pl>16 ? 16 : pl);
+
+	/* Don't leave anything around in vm they could use. */
+	memset(final,0,sizeof final);
+
+	/* Then something really weird... */
+	for (i = strlen(pw); i ; i >>= 1)
+		if(i&1)
+		    MD5Update(&ctx, final, 1);
+		else
+		    MD5Update(&ctx, pw, 1);
+
+	/* Now make the output string */
+	strcpy(passwd,md5_magic);
+	strncat(passwd,sp,sl);
+	strcat(passwd,"$");
+
+	MD5Final(final,&ctx);
+
+	/*
+	 * and now, just to make sure things don't run too fast
+	 * On a 60 Mhz Pentium this takes 34 msec, so you would
+	 * need 30 seconds to build a 1000 entry dictionary...
+	 */
+	for(i=0;i<1000;i++) {
+		MD5Init(&ctx1);
+		if(i & 1)
+			MD5Update(&ctx1,pw,strlen(pw));
+		else
+			MD5Update(&ctx1,final,16);
+
+		if(i % 3)
+			MD5Update(&ctx1,sp,sl);
+
+		if(i % 7)
+			MD5Update(&ctx1,pw,strlen(pw));
+
+		if(i & 1)
+			MD5Update(&ctx1,final,16);
+		else
+			MD5Update(&ctx1,pw,strlen(pw));
+		MD5Final(final,&ctx1);
+	}
+
+	p = passwd + strlen(passwd);
+
+	l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
+	l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
+	l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
+	l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
+	l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
+	l =                    final[11]                ; to64(p,l,2); p += 2;
+	*p = '\0';
+
+	/* Don't leave anything around in vm they could use. */
+	memset(final,0,sizeof final);
+
+	return passwd;
+}
+