* edited for clarity and style only.
*
* ----------------------------------------------------------------------------
- * The md5_crypt() function was taken from freeBSD's libcrypt and contains
- * this license:
+ * 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
* $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>
+ * On April 19th, 2001 md5_crypt() was modified to make it reentrant
+ * by Erik Andersen <andersen@uclibc.org>
+ *
*
* June 28, 2001 Manuel Novoa III
*
* "Un-inlined" code using loops and static const tables in order to
* reduce generated code size (on i386 from approx 4k to approx 2.5k).
*
- * WARNING!!! Changed PADDING array from a staticly allocated object to
- * a dynamicly generated one. Although it was declared static
- * and not static const, it doesn't appear that it ever changes.
+ * June 29, 2001 Manuel Novoa III
+ *
+ * Completely removed static PADDING array.
+ *
+ * Reintroduced the loop unrolling in MD5_Transform and added the
+ * MD5_SIZE_OVER_SPEED option for configurability. Define below as:
+ * 0 fully unrolled loops
+ * 1 partially unrolled (4 ops per loop)
+ * 2 no unrolling -- introduces the need to swap 4 variables (slow)
+ * 3 no unrolling and all 4 loops merged into one with switch
+ * in each loop (glacial)
+ * On i386, sizes are roughly (-Os -fno-builtin):
+ * 0: 3k 1: 2.5k 2: 2.2k 3: 2k
+ *
+ *
+ * Since SuSv3 does not require crypt_r, modified again August 7, 2002
+ * by Erik Andersen to remove reentrance stuff...
+ */
+
+/*
+ * Valid values are 1 (fastest/largest) to 3 (smallest/slowest).
*/
+#define MD5_SIZE_OVER_SPEED 3
+
+/**********************************************************************/
#include <sys/types.h>
#include <string.h>
#include <stdio.h>
#include <crypt.h>
#include <sys/cdefs.h>
-
+#include "libcrypt.h"
+
/* MD5 context. */
-typedef struct MD5Context {
+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);
+static void __md5_Init (struct MD5Context *);
+static void __md5_Update (struct MD5Context *, const unsigned char *, unsigned int);
+static void __md5_Pad (struct MD5Context *);
+static void __md5_Final (unsigned char [16], struct MD5Context *);
+static void __md5_Transform __P((u_int32_t [4], const unsigned char [64]));
-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 */
+#define MD5_MAGIC_STR "$1$"
+#define MD5_MAGIC_LEN (sizeof(MD5_MAGIC_STR) - 1)
+static const unsigned char __md5__magic[] = MD5_MAGIC_STR;
+static const unsigned char __md5_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
+#define __md5_Encode memcpy
+#define __md5_Decode memcpy
#else /* i386 */
/*
- * Encodes input (u_int32_t) into output (unsigned char). Assumes len is
+ * __md5_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;
+__md5_Encode (unsigned char *output, u_int32_t *input, unsigned int len)
{
unsigned int i, j;
}
/*
- * Decodes input (unsigned char) into output (u_int32_t). Assumes len is
+ * __md5_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;
+__md5_Decode (u_int32_t *output, const unsigned char *input, unsigned int len)
{
unsigned int i, j;
/* MD5 initialization. Begins an MD5 operation, writing a new context. */
-void MD5Init (MD5_CTX *context)
+static void __md5_Init (struct MD5Context *context)
{
context->count[0] = context->count[1] = 0;
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)
+static void __md5_Update ( struct MD5Context *context, const unsigned char *input, unsigned int inputLen)
{
- unsigned int i, index, partLen;
+ unsigned int i, idx, partLen;
/* Compute number of bytes mod 64 */
- index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+ idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
/* Update number of bits */
if ((context->count[0] += ((u_int32_t)inputLen << 3))
context->count[1]++;
context->count[1] += ((u_int32_t)inputLen >> 29);
- partLen = 64 - index;
+ partLen = 64 - idx;
/* Transform as many times as possible. */
if (inputLen >= partLen) {
- memcpy((void *)&context->buffer[index], (const void *)input,
+ memcpy((void *)&context->buffer[idx], (const void *)input,
partLen);
- MD5Transform (context->state, context->buffer);
+ __md5_Transform (context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
- MD5Transform (context->state, &input[i]);
+ __md5_Transform (context->state, &input[i]);
- index = 0;
+ idx = 0;
}
else
i = 0;
/* Buffer remaining input */
- memcpy ((void *)&context->buffer[index], (const void *)&input[i],
+ memcpy ((void *)&context->buffer[idx], (const void *)&input[i],
inputLen-i);
}
* MD5 padding. Adds padding followed by original length.
*/
-#define STATIC_PADDING 0
-#if STATIC_PADDING
-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
-};
-#endif
-
-void MD5Pad ( MD5_CTX *context)
+static void __md5_Pad ( struct MD5Context *context)
{
unsigned char bits[8];
- unsigned int index, padLen;
-
-#if !STATIC_PADDING
+ unsigned int idx, padLen;
unsigned char PADDING[64];
- for (index = 0 ; index < sizeof(PADDING) ; index++) {
- PADDING[index] = 0;
- }
+ memset(PADDING, 0, sizeof(PADDING));
PADDING[0] = 0x80;
-#endif
/* Save number of bits */
- Encode (bits, context->count, 8);
+ __md5_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);
+ idx = (unsigned int)((context->count[0] >> 3) & 0x3f);
+ padLen = (idx < 56) ? (56 - idx) : (120 - idx);
+ __md5_Update (context, PADDING, padLen);
/* Append length (before padding) */
- MD5Update (context, bits, 8);
+ __md5_Update (context, bits, 8);
}
/*
* the message digest and zeroizing the context.
*/
-void MD5Final ( unsigned char digest[16], MD5_CTX *context)
+static void __md5_Final ( unsigned char digest[16], struct MD5Context *context)
{
/* Do padding. */
- MD5Pad (context);
+ __md5_Pad (context);
/* Store state in digest */
- Encode (digest, context->state, 16);
+ __md5_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];
+static void __md5_Transform (u_int32_t state[4], const unsigned char block[64])
{
- u_int32_t a, b, c, d, x[16], temp;
+ u_int32_t a, b, c, d, x[16];
+#if MD5_SIZE_OVER_SPEED > 1
+ u_int32_t temp;
+ const char *ps;
+
+ static const char S[] = {
+ 7, 12, 17, 22,
+ 5, 9, 14, 20,
+ 4, 11, 16, 23,
+ 6, 10, 15, 21
+ };
+#endif /* MD5_SIZE_OVER_SPEED > 1 */
+
+#if MD5_SIZE_OVER_SPEED > 0
+ const u_int32_t *pc;
+ const char *pp;
int i;
- static const int S1[] = { 7, 12, 17, 22 };
- static const u_int32_t C1[] = {
+ static const u_int32_t C[] = {
+ /* round 1 */
0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
- 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821
- };
-
- static const int p2[] = {
- 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12
- };
- static const int S2[] = { 5, 9, 14, 20 };
- static const u_int32_t C2[] = {
+ 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+ /* round 2 */
0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8,
0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
- 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a
- };
-
- static const int p3[] = {
- 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2
- };
- static const int S3[] = { 4, 11, 16, 23 };
- static const u_int32_t C3[] = {
+ 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+ /* round 3 */
0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
- 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665
- };
-
- static const int p4[] = {
- 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9
- };
- static const int S4[] = { 6, 10, 15, 21 };
- static const u_int32_t C4[] = {
+ 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+ /* round 4 */
0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
};
- Decode (x, block, 64);
+ static const char P[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
+ 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */
+ 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */
+ 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 /* 4 */
+ };
- a = state[0]; b = state[1]; c = state[2]; d = state[3];
+#endif /* MD5_SIZE_OVER_SPEED > 0 */
+
+ __md5_Decode (x, block, 64);
+
+ a = state[0]; b = state[1]; c = state[2]; d = state[3];
+
+#if MD5_SIZE_OVER_SPEED > 2
+ pc = C; pp = P; ps = S - 4;
+
+ for ( i = 0 ; i < 64 ; i++ ) {
+ if ((i&0x0f) == 0) ps += 4;
+ temp = a;
+ switch (i>>4) {
+ case 0:
+ temp += F(b,c,d);
+ break;
+ case 1:
+ temp += G(b,c,d);
+ break;
+ case 2:
+ temp += H(b,c,d);
+ break;
+ case 3:
+ temp += I(b,c,d);
+ break;
+ }
+ temp += x[(int)(*pp++)] + *pc++;
+ temp = ROTATE_LEFT(temp, ps[i&3]);
+ temp += b;
+ a = d; d = c; c = b; b = temp;
+ }
+#elif MD5_SIZE_OVER_SPEED > 1
+ pc = C; pp = P; ps = S;
/* Round 1 */
for ( i = 0 ; i < 16 ; i++ ) {
- FF (a, b, c, d, x[i], S1[i&3], C1[i]);
- temp = d; d= c; c = b; b = a; a = temp;
+ FF (a, b, c, d, x[(int)(*pp++)], ps[i&0x3], *pc++);
+ temp = d; d = c; c = b; b = a; a = temp;
}
/* Round 2 */
- for ( i = 0 ; i < 16 ; i++ ) {
- GG (a, b, c, d, x[p2[i]], S2[i&3], C2[i]);
- temp = d; d= c; c = b; b = a; a = temp;
+ ps += 4;
+ for ( ; i < 32 ; i++ ) {
+ GG (a, b, c, d, x[(int)(*pp++)], ps[i&0x3], *pc++);
+ temp = d; d = c; c = b; b = a; a = temp;
}
/* Round 3 */
- for ( i = 0 ; i < 16 ; i++ ) {
- HH (a, b, c, d, x[p3[i]], S3[i&3], C3[i]);
- temp = d; d= c; c = b; b = a; a = temp;
+ ps += 4;
+ for ( ; i < 48 ; i++ ) {
+ HH (a, b, c, d, x[(int)(*pp++)], ps[i&0x3], *pc++);
+ temp = d; d = c; c = b; b = a; a = temp;
}
/* Round 4 */
- for ( i = 0 ; i < 16 ; i++ ) {
- II (a, b, c, d, x[p4[i]], S4[i&3], C4[i]);
- temp = d; d= c; c = b; b = a; a = temp;
+ ps += 4;
+ for ( ; i < 64 ; i++ ) {
+ II (a, b, c, d, x[(int)(*pp++)], ps[i&0x3], *pc++);
+ temp = d; d = c; c = b; b = a; a = temp;
}
+#elif MD5_SIZE_OVER_SPEED > 0
+ pc = C; pp = P;
+
+ /* Round 1 */
+ for ( i = 0 ; i < 4 ; i++ ) {
+ FF (a, b, c, d, x[(int)(*pp++)], 7, *pc++);
+ FF (d, a, b, c, x[(int)(*pp++)], 12, *pc++);
+ FF (c, d, a, b, x[(int)(*pp++)], 17, *pc++);
+ FF (b, c, d, a, x[(int)(*pp++)], 22, *pc++);
+ }
+
+ /* Round 2 */
+ for ( i = 0 ; i < 4 ; i++ ) {
+ GG (a, b, c, d, x[(int)(*pp++)], 5, *pc++);
+ GG (d, a, b, c, x[(int)(*pp++)], 9, *pc++);
+ GG (c, d, a, b, x[(int)(*pp++)], 14, *pc++);
+ GG (b, c, d, a, x[(int)(*pp++)], 20, *pc++);
+ }
+ /* Round 3 */
+ for ( i = 0 ; i < 4 ; i++ ) {
+ HH (a, b, c, d, x[(int)(*pp++)], 4, *pc++);
+ HH (d, a, b, c, x[(int)(*pp++)], 11, *pc++);
+ HH (c, d, a, b, x[(int)(*pp++)], 16, *pc++);
+ HH (b, c, d, a, x[(int)(*pp++)], 23, *pc++);
+ }
+
+ /* Round 4 */
+ for ( i = 0 ; i < 4 ; i++ ) {
+ II (a, b, c, d, x[(int)(*pp++)], 6, *pc++);
+ II (d, a, b, c, x[(int)(*pp++)], 10, *pc++);
+ II (c, d, a, b, x[(int)(*pp++)], 15, *pc++);
+ II (b, c, d, a, x[(int)(*pp++)], 21, *pc++);
+ }
+#else
+ /* 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 */
+#endif
state[0] += a;
state[1] += b;
}
-static void to64( char *s, unsigned long v, int n)
+static void __md5_to64( char *s, unsigned long v, int n)
{
while (--n >= 0) {
- *s++ = itoa64[v&0x3f];
+ *s++ = __md5_itoa64[v&0x3f];
v >>= 6;
}
}
* Use MD5 for what it is best at...
*/
-char * md5_crypt_r( const char *pw, const char *salt, struct crypt_data * data)
+char *__md5_crypt(const unsigned char *pw, const unsigned char *salt)
{
- char *p = data->p;
- const char *sp = data->sp;
- const char *ep = data->ep;
- char *passwd = data->key.b_data; /* This is a nice place where we can grab
- a bit of reentrant space... I'd create
- a separate field in struct crypt_data,
- but this spot should do nicely... */
+ /* Static stuff */
+ /* "$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;
unsigned char final[17]; /* final[16] exists only to aid in looping */
- int sl,pl,i,md5_magic_len,pw_len;
- MD5_CTX ctx,ctx1;
+ int sl,pl,i,pw_len;
+ struct MD5Context ctx,ctx1;
unsigned long l;
/* Refine the Salt first */
sp = salt;
/* If it starts with the magic string, then skip that */
- md5_magic_len = strlen(md5_magic);
- if(!strncmp(sp,md5_magic,md5_magic_len))
- sp += md5_magic_len;
+ if(!strncmp(sp,__md5__magic,MD5_MAGIC_LEN))
+ sp += MD5_MAGIC_LEN;
/* It stops at the first '$', max 8 chars */
for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
/* get the length of the true salt */
sl = ep - sp;
- MD5Init(&ctx);
+ __md5_Init(&ctx);
/* The password first, since that is what is most unknown */
pw_len = strlen(pw);
- MD5Update(&ctx,pw,pw_len);
+ __md5_Update(&ctx,pw,pw_len);
/* Then our magic string */
- MD5Update(&ctx,md5_magic,md5_magic_len);
+ __md5_Update(&ctx,__md5__magic,MD5_MAGIC_LEN);
/* Then the raw salt */
- MD5Update(&ctx,sp,sl);
+ __md5_Update(&ctx,sp,sl);
/* Then just as many characters of the MD5(pw,salt,pw) */
- MD5Init(&ctx1);
- MD5Update(&ctx1,pw,pw_len);
- MD5Update(&ctx1,sp,sl);
- MD5Update(&ctx1,pw,pw_len);
- MD5Final(final,&ctx1);
+ __md5_Init(&ctx1);
+ __md5_Update(&ctx1,pw,pw_len);
+ __md5_Update(&ctx1,sp,sl);
+ __md5_Update(&ctx1,pw,pw_len);
+ __md5_Final(final,&ctx1);
for(pl = pw_len; pl > 0; pl -= 16)
- MD5Update(&ctx,final,pl>16 ? 16 : pl);
+ __md5_Update(&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 = pw_len; i ; i >>= 1) {
- MD5Update(&ctx, ((i&1) ? final : (const unsigned char *) pw), 1);
+ __md5_Update(&ctx, ((i&1) ? final : (const unsigned char *) pw), 1);
}
/* 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] = '$';
- MD5Final(final,&ctx);
+ __md5_Final(final,&ctx);
/*
* and now, just to make sure things don't run too fast
* need 30 seconds to build a 1000 entry dictionary...
*/
for(i=0;i<1000;i++) {
- MD5Init(&ctx1);
+ __md5_Init(&ctx1);
if(i & 1)
- MD5Update(&ctx1,pw,pw_len);
+ __md5_Update(&ctx1,pw,pw_len);
else
- MD5Update(&ctx1,final,16);
+ __md5_Update(&ctx1,final,16);
if(i % 3)
- MD5Update(&ctx1,sp,sl);
+ __md5_Update(&ctx1,sp,sl);
if(i % 7)
- MD5Update(&ctx1,pw,pw_len);
+ __md5_Update(&ctx1,pw,pw_len);
if(i & 1)
- MD5Update(&ctx1,final,16);
+ __md5_Update(&ctx1,final,16);
else
- MD5Update(&ctx1,pw,pw_len);
- MD5Final(final,&ctx1);
+ __md5_Update(&ctx1,pw,pw_len);
+ __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];
- to64(p,l,4); p += 4;
+ __md5_to64(p,l,4);
+ p += 4;
}
l = final[11];
- 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. */
OSDN Git Service
