use installed dietlibc, not our forked cvs version

3 files changed, 0 insertions, 714 deletions

diff --git a/mdk-stage1/dietlibc/libcrypt/crypt.c b/mdk-stage1/dietlibc/libcrypt/crypt.c
deleted file mode 100644
index 3c162d513..000000000
--- a/mdk-stage1/dietlibc/libcrypt/crypt.c
+++ /dev/null
@@ -1,314 +0,0 @@
-#include "dietfeatures.h"
-#include <unistd.h>
-#include <md5.h>
-
-/* 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
-};
-
-/* The C and D arrays used to calculate the key schedule. */
-
-static char C[28];
-static char D[28];
-/* The key schedule. Generated from the key. */
-static char KS[16][48];
-
-/* The E bit-selection table. */
-static char E[48];
-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
-};
-
-/* Set up the key schedule from the key. */
-void setkey(const char *key)
-{
-  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++) {
-    C[i] = key[(int)PC1_C[i]];
-    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 = C[0];
-      for(j=0; j < 27; j++)
-	C[j] = C[j+1];
-      C[27] = t;
-      t = D[0];
-      for(j=0; j < 27; j++)
-	D[j] = D[j+1];
-      D[27] = t;
-    }
-    /* get Ki. Note C and D are concatenated. */
-    for(j=0; j < 24; j++) {
-      KS[i][j] = C[(int)PC2_C[j]];
-      KS[i][j+24] = D[(int)PC2_D[j]];
-    }
-  }
-
-  for(i=0; i < 48; i++)
-    E[i] = e2[i];
-}
-
-/* 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
-};
-
-/* The current block, divided into 2 halves. */
-static char L[32], R[32];
-static char tempL[32];
-static char f[32];
-
-/* The combination of the key and the input, before selection. */
-static char preS[48];
-
-/* The payoff: encrypt a block. */
-void encrypt(char block[64],int edflag)
-{
-  int  i, ii;
-  register int t, j, k;
-
-  (void)edflag;
-  /* First, permute the bits in the input */
-  for(j=0; j < 64; j++)
-    L[j] = 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++)
-      tempL[j] = R[j];
-    /* Expand R to 48 bits using the E selector;
-     * exclusive-or with the current key bits.
-     */
-    for(j=0; j < 48; j++)
-      preS[j] = R[E[j]-1] ^ 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][(preS[t]<<5)+
-	 (preS[t+1]<<3)+
-	 (preS[t+2]<<2)+
-	 (preS[t+3]<<1)+
-	 (preS[t+4]   )+
-	 (preS[t+5]<<4)];
-      t = j << 2;
-      f[t  ] = (k>>3)&01;
-      f[t+1] = (k>>2)&01;
-      f[t+2] = (k>>1)&01;
-      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++)
-      R[j] = L[j] ^ f[(int)P[j]];
-    /* Finally, the new L (the original R) is copied back. */
-    for(j=0; j < 32; j++)
-      L[j] = tempL[j];
-  }
-  /* The output L and R are reversed. */
-  for(j=0; j < 32; j++) {
-    L[j] ^= R[j];
-    R[j] ^= L[j];
-    L[j] ^= R[j];
-  }
-  /* The final output gets the inverse permutation of the very original. */
-  for(j=0; j < 64; j++)
-    block[j] = L[(int)FP[j]];
-}
-
-char * crypt(const char *pw, const char *salt)
-{
-  register int i, j, c;
-  static char block[66], iobuf[16];
-#ifdef WANT_CRYPT_MD5
-  if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$')
-    return md5crypt(pw,salt);
-#endif
-  for(i=0; i < 66; i++)
-    block[i] = 0;
-  for(i=0; (c= *pw) && i < 64; pw++) {
-    for(j=0; j < 7; j++, i++)
-      block[i] = (c>>(6-j)) & 01;
-    i++;
-  }
-
-  setkey(block);
-
-  for(i=0; i < 66; i++)
-    block[i] = 0;
-
-  for(i=0; i < 2; i++) {
-    c = *salt++;
-    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;
-	E[ind1] ^= E[ind2];
-	E[ind2] ^= E[ind1];
-	E[ind1] ^= E[ind2];
-      }
-    }
-  }
-
-  for(i=0; i < 25; i++)
-    encrypt(block,0);
-
-  for(i=0; i < 11; i++) {
-    c = 0;
-    for(j=0; j < 6; j++) {
-      c <<= 1;
-      c |= block[(((i<<1)+i)<<1)+j];
-    }
-    c += '.';
-    if(c > '9')
-      c += 7;
-    if(c > 'Z')
-      c += 6;
-    iobuf[i+2] = c;
-  }
-  iobuf[i+2] = 0;
-  if(iobuf[1] == 0)
-    iobuf[1] = iobuf[0];
-  return(iobuf);
-}
diff --git a/mdk-stage1/dietlibc/libcrypt/md5.c b/mdk-stage1/dietlibc/libcrypt/md5.c
deleted file mode 100644
index ede9a067e..000000000
--- a/mdk-stage1/dietlibc/libcrypt/md5.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*****************************************************************************
-*
-* "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm".
-*
-* 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 <endian.h>
-#include <md5.h>
-#include <string.h>
-
-#if (__BYTE_ORDER == __BIG_ENDIAN)
-/*
-   Block copy and convert byte order to little-endian.
-   dst must be 32bit aligned.
-   Length is the number of 32bit words 
-*/   
-static void CopyToLittleEndian (uint32_t *dst, const uint8_t *src, int length) {
-  while (length--) {
-    *dst=(((uint32_t)src[3])<<24) |
-	 (((uint32_t)src[2])<<16) |
-	 (((uint32_t)src[1])<< 8) |
-	   (uint32_t)src[0];
-    src+=4;
-    dst++;
-  }
-}
-#endif
-
-
-/*
-   Assembler versions of __MD5Transform, MD5Init and MD5Update
-   currently exist for x86 and little-endian ARM.
-   For other targets, we need to use the C versions below.
-*/
-
-#if !(defined (__i386__) || ((defined (__arm__) && (__BYTE_ORDER == __LITTLE_ENDIAN))))
-
-/*
-   Initialise the MD5 context.
-*/
-void MD5Init (MD5_CTX* context) {
-   context->count[0] = 0;
-   context->count[1] = 0;
-
-   context->state[0] = 0x67452301;              /* Load magic constants. */
-   context->state[1] = 0xefcdab89;
-   context->state[2] = 0x98badcfe;
-   context->state[3] = 0x10325476;
-}
-
-#define ROTATE_LEFT(x, n) ((x << n) | (x >> (32-n)))
-
-#define F(x, y, z) (z ^ (x & (y ^ z)))
-#define G(x, y, z) (y ^ (z & (x ^ y)))
-#define H(x, y, z) (x ^ y ^ z)
-#define I(x, y, z) (y ^ (x | ~z))
-
-#define FF(a, b, c, d, x, s, ac) { (a) += F (b, c, d) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT (a, s); (a) += (b); }
-#define GG(a, b, c, d, x, s, ac) { (a) += G (b, c, d) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT (a, s); (a) += (b); }
-#define HH(a, b, c, d, x, s, ac) { (a) += H (b, c, d) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT (a, s); (a) += (b); }
-#define II(a, b, c, d, x, s, ac) { (a) += I (b, c, d) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT (a, s); (a) += (b); }
-
-static void __MD5Transform (uint32_t state[4], const uint8_t *in, int repeat) {
-   const uint32_t *x;
-
-   uint32_t  a = state[0];
-   uint32_t  b = state[1];
-   uint32_t  c = state[2];
-   uint32_t  d = state[3];
-
-   for ( ; repeat; repeat--) {
-      uint32_t tempBuffer[16];
-#if (__BYTE_ORDER == __BIG_ENDIAN)
-
-      CopyToLittleEndian (tempBuffer, in, 16);
-      x = tempBuffer;
-#else
-      if ((long)in & 3) {
-	memcpy(tempBuffer, in, 64);
-	x = tempBuffer;
-      } else
-	x = (const uint32_t *) in;
-#endif
-
-      FF (a, b, c, d, x[ 0],  7, 0xd76aa478); /*  1 */     /* Round 1 */
-      FF (d, a, b, c, x[ 1], 12, 0xe8c7b756); /*  2 */
-      FF (c, d, a, b, x[ 2], 17, 0x242070db); /*  3 */
-      FF (b, c, d, a, x[ 3], 22, 0xc1bdceee); /*  4 */
-      FF (a, b, c, d, x[ 4],  7, 0xf57c0faf); /*  5 */
-      FF (d, a, b, c, x[ 5], 12, 0x4787c62a); /*  6 */
-      FF (c, d, a, b, x[ 6], 17, 0xa8304613); /*  7 */
-      FF (b, c, d, a, x[ 7], 22, 0xfd469501); /*  8 */
-      FF (a, b, c, d, x[ 8],  7, 0x698098d8); /*  9 */
-      FF (d, a, b, c, x[ 9], 12, 0x8b44f7af); /* 10 */
-      FF (c, d, a, b, x[10], 17, 0xffff5bb1); /* 11 */
-      FF (b, c, d, a, x[11], 22, 0x895cd7be); /* 12 */
-      FF (a, b, c, d, x[12],  7, 0x6b901122); /* 13 */
-      FF (d, a, b, c, x[13], 12, 0xfd987193); /* 14 */
-      FF (c, d, a, b, x[14], 17, 0xa679438e); /* 15 */
-      FF (b, c, d, a, x[15], 22, 0x49b40821); /* 16 */
-
-      GG (a, b, c, d, x[ 1],  5, 0xf61e2562); /* 17 */     /* Round 2 */
-      GG (d, a, b, c, x[ 6],  9, 0xc040b340); /* 18 */
-      GG (c, d, a, b, x[11], 14, 0x265e5a51); /* 19 */
-      GG (b, c, d, a, x[ 0], 20, 0xe9b6c7aa); /* 20 */
-      GG (a, b, c, d, x[ 5],  5, 0xd62f105d); /* 21 */
-      GG (d, a, b, c, x[10],  9, 0x02441453); /* 22 */
-      GG (c, d, a, b, x[15], 14, 0xd8a1e681); /* 23 */
-      GG (b, c, d, a, x[ 4], 20, 0xe7d3fbc8); /* 24 */
-      GG (a, b, c, d, x[ 9],  5, 0x21e1cde6); /* 25 */
-      GG (d, a, b, c, x[14],  9, 0xc33707d6); /* 26 */
-      GG (c, d, a, b, x[ 3], 14, 0xf4d50d87); /* 27 */
-      GG (b, c, d, a, x[ 8], 20, 0x455a14ed); /* 28 */
-      GG (a, b, c, d, x[13],  5, 0xa9e3e905); /* 29 */
-      GG (d, a, b, c, x[ 2],  9, 0xfcefa3f8); /* 30 */
-      GG (c, d, a, b, x[ 7], 14, 0x676f02d9); /* 31 */
-      GG (b, c, d, a, x[12], 20, 0x8d2a4c8a); /* 32 */
-
-      HH (a, b, c, d, x[ 5],  4, 0xfffa3942); /* 33 */     /* Round 3 */
-      HH (d, a, b, c, x[ 8], 11, 0x8771f681); /* 34 */
-      HH (c, d, a, b, x[11], 16, 0x6d9d6122); /* 35 */
-      HH (b, c, d, a, x[14], 23, 0xfde5380c); /* 36 */
-      HH (a, b, c, d, x[ 1],  4, 0xa4beea44); /* 37 */
-      HH (d, a, b, c, x[ 4], 11, 0x4bdecfa9); /* 38 */
-      HH (c, d, a, b, x[ 7], 16, 0xf6bb4b60); /* 39 */
-      HH (b, c, d, a, x[10], 23, 0xbebfbc70); /* 40 */
-      HH (a, b, c, d, x[13],  4, 0x289b7ec6); /* 41 */
-      HH (d, a, b, c, x[ 0], 11, 0xeaa127fa); /* 42 */
-      HH (c, d, a, b, x[ 3], 16, 0xd4ef3085); /* 43 */
-      HH (b, c, d, a, x[ 6], 23, 0x04881d05); /* 44 */
-      HH (a, b, c, d, x[ 9],  4, 0xd9d4d039); /* 45 */
-      HH (d, a, b, c, x[12], 11, 0xe6db99e5); /* 46 */
-      HH (c, d, a, b, x[15], 16, 0x1fa27cf8); /* 47 */
-      HH (b, c, d, a, x[ 2], 23, 0xc4ac5665); /* 48 */
-
-      II (a, b, c, d, x[ 0],  6, 0xf4292244); /* 49 */     /* Round 4 */
-      II (d, a, b, c, x[ 7], 10, 0x432aff97); /* 50 */
-      II (c, d, a, b, x[14], 15, 0xab9423a7); /* 51 */
-      II (b, c, d, a, x[ 5], 21, 0xfc93a039); /* 52 */
-      II (a, b, c, d, x[12],  6, 0x655b59c3); /* 53 */
-      II (d, a, b, c, x[ 3], 10, 0x8f0ccc92); /* 54 */
-      II (c, d, a, b, x[10], 15, 0xffeff47d); /* 55 */
-      II (b, c, d, a, x[ 1], 21, 0x85845dd1); /* 56 */
-      II (a, b, c, d, x[ 8],  6, 0x6fa87e4f); /* 57 */
-      II (d, a, b, c, x[15], 10, 0xfe2ce6e0); /* 58 */
-      II (c, d, a, b, x[ 6], 15, 0xa3014314); /* 59 */
-      II (b, c, d, a, x[13], 21, 0x4e0811a1); /* 60 */
-      II (a, b, c, d, x[ 4],  6, 0xf7537e82); /* 61 */
-      II (d, a, b, c, x[11], 10, 0xbd3af235); /* 62 */
-      II (c, d, a, b, x[ 2], 15, 0x2ad7d2bb); /* 63 */
-      II (b, c, d, a, x[ 9], 21, 0xeb86d391); /* 64 */
-
-      state[0] = a = a + state[0];
-      state[1] = b = b + state[1];
-      state[2] = c = c + state[2];
-      state[3] = d = d + state[3];
-
-      in += 64;
-   }
-}
-
-
-/*
-   MD5 block update operation:
-   Process another sub-string of the message and update the context.
-*/
-void MD5Update (MD5_CTX *context, const uint8_t *input, size_t inputBytes) {
-   int i;
-   int byteIndex;
-   unsigned int partLen;
-   int len;
-
-   /* Compute number of bytes mod 64 */
-   byteIndex = (context->count[0] >> 3) & 0x3F;
-
-   /* Update number of bits: count += 8 * inputBytes */
-   if ((context->count[0] += inputBytes << 3) < (inputBytes << 3))
-      context->count[1]++;
-   context->count[1] += (inputBytes >> (32-3));
-
-   partLen = (64 - byteIndex);
-
-   /* Transform as many times as possible. */
-   if (inputBytes >= partLen) {
-      memcpy (context->buffer + byteIndex, input, partLen);
-      __MD5Transform (context->state, (const uint8_t *) context->buffer, 1);
-      len = (inputBytes - partLen) / 64;
-      __MD5Transform (context->state, &input[partLen], len);
-      i = partLen + 64 * len;
-      byteIndex = 0;
-   } else
-      i = 0;
-
-   /* Buffer remaining input */
-   memcpy (&context->buffer[byteIndex], &input[i], inputBytes - i);
-}
-
-#endif
-
-
-void MD5Final (uint8_t digest[16], MD5_CTX* context) {
-   static uint8_t finalBlock[64];
-
-   uint32_t bits[2];
-   int      byteIndex;
-   int      finalBlockLength;
-
-   byteIndex = (context->count[0] >> 3) & 0x3F;
-   finalBlockLength = ((byteIndex < 56) ? 56 : 120) - byteIndex;
-   finalBlock[0] = 0x80;
-
-#if (__BYTE_ORDER == __BIG_ENDIAN)
-   CopyToLittleEndian (bits, (const uint8_t *) context->count, 2);
-#else
-   memcpy(bits, context->count, 8);
-#endif
-
-   MD5Update (context, finalBlock, finalBlockLength);
-   MD5Update (context, (const uint8_t *) bits, 8);
-
-#if (__BYTE_ORDER == __BIG_ENDIAN)
-   CopyToLittleEndian ((uint32_t *) digest, (const uint8_t *) context->state, 4);
-#else
-   memcpy (digest, context->state, 16);
-#endif
-
-   memset(context, 0, sizeof(*context));
-}
-
diff --git a/mdk-stage1/dietlibc/libcrypt/md5crypt.c b/mdk-stage1/dietlibc/libcrypt/md5crypt.c
deleted file mode 100644
index ebbb4be44..000000000
--- a/mdk-stage1/dietlibc/libcrypt/md5crypt.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*	$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $	*/
-
-/*
- * ----------------------------------------------------------------------------
- * "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: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp $
- *
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <md5.h>
-
-static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-static void to64 (char *, uint32_t, int);
-
-static void
-to64(s, v, n)
-	char *s;
-	uint32_t v;
-	int n;
-{
-	while (--n >= 0) {
-		*s++ = itoa64[v&0x3f];
-		v >>= 6;
-	}
-}
-
-/*
- * UNIX password
- *
- * Use MD5 for what it is best at...
- */
-
-char *
-md5crypt(pw, salt)
-	register const char *pw;
-	register const char *salt;
-{
-	/*
-	 * This string is magic for this algorithm.  Having
-	 * it this way, we can get get better later on
-	 */
-	static unsigned char	*magic = (unsigned char *)"$1$";
-
-	static char     passwd[120], *p;
-	static const unsigned char *sp,*ep;
-	unsigned char	final[16];
-	int sl,pl,i;
-	MD5_CTX	ctx,ctx1;
-	uint32_t l;
-
-	/* Refine the Salt first */
-	sp = (const unsigned char *)salt;
-
-	/* If it starts with the magic string, then skip that */
-	if(!strncmp((const char *)sp,(const char *)magic,strlen((const char *)magic)))
-		sp += strlen((const char *)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,(const unsigned char *)pw,strlen(pw));
-
-	/* Then our magic string */
-	MD5Update(&ctx,magic,strlen((const char *)magic));
-
-	/* Then the raw salt */
-	MD5Update(&ctx,sp,sl);
-
-	/* Then just as many characters of the MD5(pw,salt,pw) */
-	MD5Init(&ctx1);
-	MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
-	MD5Update(&ctx1,sp,sl);
-	MD5Update(&ctx1,(const unsigned char *)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, (const unsigned char *)pw, 1);
-
-	/* Now make the output string */
-	strcpy(passwd,(const char *)magic);
-	memcpy(passwd+3,sp,sl);
-	passwd[sl+3]='$';
-	passwd[sl+4]=0;
-
-	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,(const unsigned char *)pw,strlen(pw));
-		else
-			MD5Update(&ctx1,final,16);
-
-		if(i % 3)
-			MD5Update(&ctx1,sp,sl);
-
-		if(i % 7)
-			MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
-
-		if(i & 1)
-			MD5Update(&ctx1,final,16);
-		else
-			MD5Update(&ctx1,(const unsigned char *)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;
-}
-