*
* ircd_crypt_smd5 is largely taken from md5_crypt.c from the Linux PAM
* source code. it's been modified to fit in with ircu and some of the
- * undeeded code has been removed. the source file md5_crypt.c has the
- * following licence, so if any of our opers or admins are in Denmark
+ * unneeded code has been removed. the source file md5_crypt.c has the
+ * following license, so if any of our opers or admins are in Denmark
* they better go buy them a drink ;) -- hikari
*
* ----------------------------------------------------------------------------
#include "config.h"
#include "ircd_crypt.h"
#include "ircd_crypt_smd5.h"
+#include "ircd_log.h"
#include "ircd_md5.h"
#include "s_debug.h"
#include "ircd_alloc.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <string.h>
#include <unistd.h>
* @param v The unsigned long we're working on
* @param n The number of bytes we're working with
*
- * This is used to produce the normal MD5 hash everyone is familar with.
+ * This is used to produce the normal MD5 hash everyone is familiar with.
* It takes the value v and converts n bytes of it it into an ASCII string in
* 6-bit chunks, the resulting string is put at the address pointed to by s.
*
* @return The Salted MD5 password of key and salt
*
* Erm does exactly what the brief comment says. If you think I'm writing a
- * description of how MD5 works, you have another thing comming. Go and read
- * Applied Cryptopgraphy by Bruce Schneier. The only difference is we use a
- * salt at the begining of the password to perturb it so that the same password
+ * description of how MD5 works, you have another think coming. Go and read
+ * Applied Cryptography by Bruce Schneier. The only difference is we use a
+ * salt at the beginning of the password to perturb it so that the same password
* doesn't always produce the same hash.
*
*/
const char* ircd_crypt_smd5(const char* key, const char* salt)
{
const char *magic = "$1$";
-char *passwd, *p;
+static char passwd[120];
+char *p;
const char *sp, *ep;
unsigned char final[16];
int sl, pl, i, j;
/* Refine the Salt first */
ep = sp = salt;
- if(NULL == (passwd = (char *)MyMalloc(120)))
- return NULL;
-
- memset(passwd, 0, 120);
-
for (ep = sp; *ep && *ep != '$' && ep < (sp + 8); ep++)
continue;
/* get the length of the true salt */
sl = ep - sp;
- MD5Name(MD5Init)(&ctx);
+ MD5Init(&ctx);
/* The password first, since that is what is most unknown */
- MD5Name(MD5Update)(&ctx,(unsigned const char *)key,strlen(key));
+ MD5Update(&ctx,(unsigned const char *)key,strlen(key));
/* Then our magic string */
- MD5Name(MD5Update)(&ctx,(unsigned const char *)magic,strlen(magic));
+ MD5Update(&ctx,(unsigned const char *)magic,strlen(magic));
/* Then the raw salt */
- MD5Name(MD5Update)(&ctx,(unsigned const char *)sp,sl);
+ MD5Update(&ctx,(unsigned const char *)sp,sl);
/* Then just as many characters of the MD5(key,salt,key) */
- MD5Name(MD5Init)(&ctx1);
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)key,strlen(key));
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)sp,sl);
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)key,strlen(key));
- MD5Name(MD5Final)(final,&ctx1);
+ MD5Init(&ctx1);
+ MD5Update(&ctx1,(unsigned const char *)key,strlen(key));
+ MD5Update(&ctx1,(unsigned const char *)sp,sl);
+ MD5Update(&ctx1,(unsigned const char *)key,strlen(key));
+ MD5Final(final,&ctx1);
for (pl = strlen(key); pl > 0; pl -= 16)
- MD5Name(MD5Update)(&ctx,(unsigned const char *)final,pl>16 ? 16 : pl);
+ 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);
/* Then something really weird... */
for (j = 0, i = strlen(key); i; i >>= 1)
if (i & 1)
- MD5Name(MD5Update)(&ctx, (unsigned const char *)final+j, 1);
+ MD5Update(&ctx, (unsigned const char *)final+j, 1);
else
- MD5Name(MD5Update)(&ctx, (unsigned const char *)key+j, 1);
+ MD5Update(&ctx, (unsigned const char *)key+j, 1);
- /* Now make the output string
- strcpy(passwd, magic);
- strncat(passwd, sp, sl); */
+ /* Now make the output string. */
+ memset(passwd, 0, 120);
strncpy(passwd, sp, sl);
strcat(passwd, "$");
- MD5Name(MD5Final)(final,&ctx);
+ MD5Final(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++) {
- MD5Name(MD5Init)(&ctx1);
+ MD5Init(&ctx1);
if (i & 1)
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)key,strlen(key));
+ MD5Update(&ctx1,(unsigned const char *)key,strlen(key));
else
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)final,16);
+ MD5Update(&ctx1,(unsigned const char *)final,16);
if (i % 3)
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)sp,sl);
+ MD5Update(&ctx1,(unsigned const char *)sp,sl);
if (i % 7)
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)key,strlen(key));
+ MD5Update(&ctx1,(unsigned const char *)key,strlen(key));
if (i & 1)
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)final,16);
+ MD5Update(&ctx1,(unsigned const char *)final,16);
else
- MD5Name(MD5Update)(&ctx1,(unsigned const char *)key,strlen(key));
+ MD5Update(&ctx1,(unsigned const char *)key,strlen(key));
- MD5Name(MD5Final)(final,&ctx1);
+ MD5Final(final,&ctx1);
}
p = passwd + strlen(passwd);