Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------

Big "automake/autoconf/libtool" commit

1 files changed, 52 insertions, 36 deletions

diff --git a/modules/pam_pwdb/md5_crypt.c b/modules/pam_pwdb/md5_crypt.c
index 4226dd1e..53972fcc 100644
--- a/modules/pam_pwdb/md5_crypt.c
+++ b/modules/pam_pwdb/md5_crypt.c
@@ -1,4 +1,5 @@
-/* $Id$
+/*
+ * $Id$
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -12,16 +13,16 @@
  */
 
 #include <string.h>
+#include <stdlib.h>
 #include "md5.h"
 
-static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+static unsigned char itoa64[] =	/* 0 ... 63 => ascii - 64 */
+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
-static void
-to64(char *s, unsigned long v, int n)
+static void to64(char *s, unsigned long v, int n)
 {
 	while (--n >= 0) {
-		*s++ = itoa64[v&0x3f];
+		*s++ = itoa64[v & 0x3f];
 		v >>= 6;
 	}
 }
@@ -32,27 +33,31 @@ to64(char *s, unsigned long v, int n)
  * Use MD5 for what it is best at...
  */
 
-char * MD5Name(crypt_md5)(const char *pw, const char *salt)
+char *MD5Name(crypt_md5)(const char *pw, const char *salt)
 {
 	const char *magic = "$1$";
 	/* This string is magic for this algorithm.  Having
 	 * it this way, we can get get better later on */
-	static char passwd[120], *p;
-	static const char *sp,*ep;
-	unsigned char	final[16];
-	int sl,pl,i,j;
-	MD5_CTX	ctx,ctx1;
+	char *passwd, *p;
+	const char *sp, *ep;
+	unsigned char final[16];
+	int sl, pl, i, j;
+	MD5_CTX ctx, ctx1;
 	unsigned long l;
 
 	/* Refine the Salt first */
 	sp = salt;
 
+	/* TODO: now that we're using malloc'ed memory, get rid of the
+	   strange constant buffer size. */
+	passwd = malloc(120);
+
 	/* If it starts with the magic string, then skip that */
-	if(!strncmp(sp,magic,strlen(magic)))
+	if (!strncmp(sp, magic, strlen(magic)))
 		sp += strlen(magic);
 
 	/* It stops at the first '$', max 8 chars */
-	for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+	for (ep = sp; *ep && *ep != '$' && ep < (sp + 8); ep++)
 		continue;
 
 	/* get the length of the true salt */
@@ -75,23 +80,23 @@ char * MD5Name(crypt_md5)(const char *pw, const char *salt)
 	MD5Name(MD5Update)(&ctx1,(unsigned const char *)sp,sl);
 	MD5Name(MD5Update)(&ctx1,(unsigned const char *)pw,strlen(pw));
 	MD5Name(MD5Final)(final,&ctx1);
-	for(pl = strlen(pw); pl > 0; pl -= 16)
+	for (pl = strlen(pw); pl > 0; pl -= 16)
 		MD5Name(MD5Update)(&ctx,(unsigned const char *)final,pl>16 ? 16 : pl);
 
 	/* Don't leave anything around in vm they could use. */
-	memset(final,0,sizeof final);
+	memset(final, 0, sizeof final);
 
 	/* Then something really weird... */
-	for (j=0,i = strlen(pw); i ; i >>= 1)
-		if(i&1)
-		    MD5Name(MD5Update)(&ctx, (unsigned const char *)final+j, 1);
+	for (j = 0, i = strlen(pw); i; i >>= 1)
+		if (i & 1)
+			MD5Name(MD5Update)(&ctx, (unsigned const char *)final+j, 1);
 		else
-		    MD5Name(MD5Update)(&ctx, (unsigned const char *)pw+j, 1);
+			MD5Name(MD5Update)(&ctx, (unsigned const char *)pw+j, 1);
 
 	/* Now make the output string */
-	strcpy(passwd,magic);
-	strncat(passwd,sp,sl);
-	strcat(passwd,"$");
+	strcpy(passwd, magic);
+	strncat(passwd, sp, sl);
+	strcat(passwd, "$");
 
 	MD5Name(MD5Final)(final,&ctx);
 
@@ -100,20 +105,20 @@ char * MD5Name(crypt_md5)(const char *pw, const char *salt)
 	 * 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++) {
+	for (i = 0; i < 1000; i++) {
 		MD5Name(MD5Init)(&ctx1);
-		if(i & 1)
+		if (i & 1)
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)pw,strlen(pw));
 		else
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)final,16);
 
-		if(i % 3)
+		if (i % 3)
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)sp,sl);
 
-		if(i % 7)
+		if (i % 7)
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)pw,strlen(pw));
 
-		if(i & 1)
+		if (i & 1)
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)final,16);
 		else
 			MD5Name(MD5Update)(&ctx1,(unsigned const char *)pw,strlen(pw));
@@ -122,17 +127,28 @@ char * MD5Name(crypt_md5)(const char *pw, const char *salt)
 
 	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;
+	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);
+	memset(final, 0, sizeof final);
 
 	return passwd;
 }
-