mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add salted MD5/SHA1 password support from -devel.

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-01-20 01:04:51 +00:00
parent 6896a2be62
commit a5fa4a0e78
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -3,7 +3,8 @@ OpenLDAP Change Log
Changes included in OpenLDAP 1.2
CVS Tag: OPENLDAP_REL_ENG_1_2
Add ldappasswd() tool
Add client/tools password prompting
Add salted MD5/SHA1 password support
Add client/tools password prompting (-W)
Fix lber leaking ber_scanf
Update client/tools Kerberos option handling

62
libraries/liblutil/passwd.c
View File

@ -10,6 +10,8 @@
#include "portable.h"
#include <stdlib.h>
#include <ac/string.h>
#include <ac/unistd.h>
@ -70,6 +72,66 @@ lutil_passwd(
return( strcmp(p, base64digest) );
} else if (strncasecmp(passwd, "{SSHA}", sizeof("{SSHA}") - 1) == 0) {
lutil_SHA1_CTX SHA1context;
unsigned char SHA1digest[20];
const char *p = passwd + (sizeof("{SSHA}") - 1);
int pw_len = strlen(p);
int rc;
unsigned char *orig_pass = NULL;
/* base64 un-encode password */
orig_pass = (unsigned char *)malloc(pw_len * 0.75 + 1);
if ((rc = lutil_b64_pton(p, orig_pass, pw_len)) < 0)
{
free(orig_pass);
return ( 1 );
}
/* hash credentials with salt */
lutil_SHA1Init(&SHA1context);
lutil_SHA1Update(&SHA1context,
(const unsigned char *) cred, strlen(cred));
lutil_SHA1Update(&SHA1context,
(const unsigned char *) orig_pass + sizeof(SHA1digest),
rc - sizeof(SHA1digest));
lutil_SHA1Final(SHA1digest, &SHA1context);
/* compare */
rc = strncmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
free(orig_pass);
return(rc);
} else if (strncasecmp(passwd, "{SMD5}", sizeof("{SMD5}") - 1) == 0) {
lutil_MD5_CTX MD5context;
unsigned char MD5digest[16];
const char *p = passwd + (sizeof("{SMD5}") - 1);
int pw_len = strlen(p);
int rc;
unsigned char *orig_pass = NULL;
/* base64 un-encode password */
orig_pass = (unsigned char *)malloc(pw_len * 0.75 + 1);
if ((rc = lutil_b64_pton(p, orig_pass, pw_len)) < 0)
{
free(orig_pass);
return ( 1 );
}
/* hash credentials with salt */
lutil_MD5Init(&MD5context);
lutil_MD5Update(&MD5context,
(const unsigned char *) cred, strlen(cred));
lutil_MD5Update(&MD5context,
(const unsigned char *) orig_pass + sizeof(MD5digest),
rc - sizeof(MD5digest));
lutil_MD5Final(MD5digest, &MD5context);
/* compare */
rc = strncmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
free(orig_pass);
return ( rc );
#ifdef SLAPD_CRYPT
} else if (strncasecmp(passwd, "{CRYPT}", sizeof("{CRYPT}") - 1) == 0 ) {
const char *p = passwd + (sizeof("{CRYPT}") - 1);