dl-string.h: remove mips related guard

[uclinux-h8/uClibc.git] / libcrypt / md5.c

diff --git a/libcrypt/md5.c b/libcrypt/md5.c
index 145e773..1af11ed 100644 (file)
--- a/libcrypt/md5.c
+++ b/libcrypt/md5.c
@@ -98,8 +98,6 @@ static void __md5_Transform __P((u_int32_t [4], const unsigned char [64]));
 #define MD5_MAGIC_STR "$1$"
 #define MD5_MAGIC_LEN (sizeof(MD5_MAGIC_STR) - 1)
 static const unsigned char __md5__magic[] = MD5_MAGIC_STR;
-/* This string is magic for this algorithm.  Having
- * it this way, we can get better later on */
 static const unsigned char __md5_itoa64[] =            /* 0 ... 63 => ascii - 64 */
        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
@@ -190,7 +188,7 @@ static void __md5_Init (struct MD5Context *context)
        context->state[3] = 0x10325476;
 }
 
-/* 
+/*
  * MD5 block update operation. Continues an MD5 message-digest
  * operation, processing another message block, and updating the
  * context.
@@ -533,7 +531,8 @@ static void __md5_to64( char *s, unsigned long v, int n)
 char *__md5_crypt(const unsigned char *pw, const unsigned char *salt)
 {
        /* Static stuff */
-       static char passwd[120];
+       /* "$1$" + salt_up_to_8_chars + "$" + 22_bytes_of_hash + NUL */
+       static char passwd[3 + 8 + 1 + 22 + 1];
 
        const unsigned char *sp, *ep;
        char *p;
@@ -586,9 +585,9 @@ char *__md5_crypt(const unsigned char *pw, const unsigned char *salt)
        }
 
        /* Now make the output string */
-       strcpy(passwd,__md5__magic);
-       strncat(passwd,sp,sl);
-       strcat(passwd,"$");
+       strcpy(passwd,__md5__magic); /* 3 bytes */
+       strncpy(passwd+MD5_MAGIC_LEN,(char*)sp,sl); /* 8 or less */
+       passwd[MD5_MAGIC_LEN+sl] = '$';
 
        __md5_Final(final,&ctx);
 
@@ -617,15 +616,17 @@ char *__md5_crypt(const unsigned char *pw, const unsigned char *salt)
                __md5_Final(final,&ctx1);
        }
 
-       p = passwd + strlen(passwd);
-
+       /* Add 5*4+2 = 22 bytes of hash, + NUL byte. */
+       p = passwd + MD5_MAGIC_LEN + sl + 1;
        final[16] = final[5];
        for ( i=0 ; i < 5 ; i++ ) {
                l = (final[i]<<16) | (final[i+6]<<8) | final[i+12];
-               __md5_to64(p,l,4); p += 4;
+               __md5_to64(p,l,4);
+               p += 4;
        }
        l = final[11];
-       __md5_to64(p,l,2); p += 2;
+       __md5_to64(p,l,2);
+       p += 2;
        *p = '\0';
 
        /* Don't leave anything around in vm they could use. */