mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-12 15:10:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanups. MD5 and SHA1 routines should be a little faster and easier to read.

Browse Source
This commit is contained in:
Dave Storey 1998-12-22 14:31:31 +00:00
parent a64c2a3954
commit 13457efbbc
1 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clients/tools/ldappasswd.c
View File

@ -195,30 +195,14 @@ hash_md5 (const char *pw_in, Salt * salt)
{
lutil_MD5_CTX MD5context;
unsigned char MD5digest[16];
unsigned char *hashing_pw = (unsigned char *)pw_in;
char *base64digest = NULL;
int tot_len = strlen (pw_in);
int salted = (salt && salt->salt && salt->len);
/* append salt to password */
if (salted)
{
hashing_pw = (unsigned char *)malloc (tot_len + salt->len);
memcpy (hashing_pw, pw_in, tot_len);
memcpy (&hashing_pw[tot_len], salt->salt, salt->len);
tot_len += salt->len;
}
lutil_MD5Init (&MD5context);
lutil_MD5Update (&MD5context, hashing_pw, tot_len);
lutil_MD5Update (&MD5context, pw_in, strlen(pw_in));
if (salt && salt->salt && salt->len)
lutil_MD5Update (&MD5context, salt->salt, salt->len);
lutil_MD5Final (MD5digest, &MD5context);
base64digest = pw_encode (MD5digest, salt, sizeof (MD5digest));
if (salted)
free (hashing_pw);
return (base64digest);
return (pw_encode (MD5digest, salt, sizeof (MD5digest)));
}
char *
@ -226,30 +210,14 @@ hash_sha1 (const char *pw_in, Salt * salt)
{
lutil_SHA1_CTX SHA1context;
unsigned char SHA1digest[20];
unsigned char *hashing_pw = (unsigned char *)pw_in;
char *base64digest = NULL;
int tot_len = strlen (pw_in);
int salted = (salt && salt->salt);
/* append salt to password */
if (salted)
{
hashing_pw = (unsigned char *)malloc (tot_len + salt->len);
memcpy (hashing_pw, pw_in, tot_len);
memcpy (&hashing_pw[tot_len], salt->salt, salt->len);
tot_len += salt->len;
}
lutil_SHA1Init (&SHA1context);
lutil_SHA1Update (&SHA1context, hashing_pw, tot_len);
lutil_SHA1Update (&SHA1context, pw_in, strlen(pw_in));
if (salt && salt->salt && salt->len)
lutil_SHA1Update (&SHA1context, salt->salt, salt->len);
lutil_SHA1Final (SHA1digest, &SHA1context);
base64digest = pw_encode (SHA1digest, salt, sizeof (SHA1digest));
if (salted)
free (hashing_pw);
return (base64digest);
return (pw_encode (SHA1digest, salt, sizeof (SHA1digest)));
}
static Hash hashes[] =