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

Export pw_string64 as lutil_passwd_string64

Browse Source
This commit is contained in:
Howard Chu 2011-02-07 00:46:06 +00:00 committed by Quanah Gibson-Mount
parent 5d2a30c860
commit 66f9f50d98
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/lutil.h
View File

@ -143,6 +143,13 @@ LDAP_LUTIL_F( int )
lutil_salt_format LDAP_P((
const char *format ));
LDAP_LUTIL_F( int )
lutil_passwd_string64 LDAP_P((
const struct berval *sc,
const struct berval *hash,
struct berval *b64,
const struct berval *salt ));
/* utils.c */
LDAP_LUTIL_F( char* )
lutil_progname LDAP_P((

10
libraries/liblutil/passwd.c
View File

@ -424,7 +424,7 @@ static int pw_string(
}
#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
static int pw_string64(
int lutil_passwd_string64(
const struct berval *sc,
const struct berval *hash,
struct berval *b64,
@ -1051,7 +1051,7 @@ static int hash_ssha1(
(const unsigned char *)salt.bv_val, salt.bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
return pw_string64( scheme, &digest, hash, &salt);
return lutil_passwd_string64( scheme, &digest, hash, &salt);
}
static int hash_sha1(
@ -1071,7 +1071,7 @@ static int hash_sha1(
(const unsigned char *)passwd->bv_val, passwd->bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
return pw_string64( scheme, &digest, hash, NULL);
return lutil_passwd_string64( scheme, &digest, hash, NULL);
}
#endif
@ -1103,7 +1103,7 @@ static int hash_smd5(
(const unsigned char *) salt.bv_val, salt.bv_len );
lutil_MD5Final( MD5digest, &MD5context );
return pw_string64( scheme, &digest, hash, &salt );
return lutil_passwd_string64( scheme, &digest, hash, &salt );
}
static int hash_md5(
@ -1125,7 +1125,7 @@ static int hash_md5(
(const unsigned char *) passwd->bv_val, passwd->bv_len );
lutil_MD5Final( MD5digest, &MD5context );
return pw_string64( scheme, &digest, hash, NULL );
return lutil_passwd_string64( scheme, &digest, hash, NULL );
;
}