mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-01 12:39:35 -05:00
Fix up lutil_passwd stuff to avoid struct berval definition
This commit is contained in:
Howard Chu
parent
bd935956f4
commit
62f7394f8c
2 changed files with 78 additions and 131 deletions
|
|
@ -57,12 +57,7 @@ lutil_entropy LDAP_P((
|
|||
ber_len_t nbytes ));
|
||||
|
||||
/* passfile.c */
|
||||
#ifndef _LBER_H
|
||||
struct berval { /* avoid pulling in lber.h */
|
||||
ber_len_t bv_len;
|
||||
char *bv_val;
|
||||
};
|
||||
#endif
|
||||
struct berval; /* avoid pulling in lber.h */
|
||||
|
||||
LDAP_LUTIL_F( int )
|
||||
lutil_get_filed_password LDAP_P((
|
||||
|
|
@ -72,23 +67,20 @@ lutil_get_filed_password LDAP_P((
|
|||
/* passwd.c */
|
||||
struct lutil_pw_scheme;
|
||||
|
||||
typedef int (*LUTIL_PASSWD_CHK_FUNC)(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
typedef int (LUTIL_PASSWD_CHK_FUNC)(
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
|
||||
typedef struct berval * (*LUTIL_PASSWD_HASH_FUNC) (
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
typedef struct berval * (LUTIL_PASSWD_HASH_FUNC) (
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd );
|
||||
|
||||
struct lutil_pw_scheme {
|
||||
struct berval name;
|
||||
LUTIL_PASSWD_CHK_FUNC chk_fn;
|
||||
LUTIL_PASSWD_HASH_FUNC hash_fn;
|
||||
};
|
||||
|
||||
LDAP_LUTIL_F( int )
|
||||
lutil_passwd_add LDAP_P(( struct lutil_pw_scheme *s ));
|
||||
lutil_passwd_add LDAP_P((
|
||||
struct berval *scheme,
|
||||
LUTIL_PASSWD_CHK_FUNC *chk_fn,
|
||||
LUTIL_PASSWD_HASH_FUNC *hash_fn ));
|
||||
|
||||
LDAP_LUTIL_F( void )
|
||||
lutil_passwd_init LDAP_P(( void ));
|
||||
|
|
|
|||
|
|
@ -78,117 +78,67 @@ static const unsigned char crypt64[] =
|
|||
static char *salt_format = NULL;
|
||||
#endif
|
||||
|
||||
struct pw_scheme {
|
||||
struct berval name;
|
||||
LUTIL_PASSWD_CHK_FUNC *chk_fn;
|
||||
LUTIL_PASSWD_HASH_FUNC *hash_fn;
|
||||
};
|
||||
|
||||
struct pw_slist {
|
||||
struct pw_slist *next;
|
||||
struct lutil_pw_scheme s;
|
||||
struct pw_scheme s;
|
||||
};
|
||||
|
||||
/* password check routines */
|
||||
static int chk_md5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
|
||||
static int chk_smd5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_md5;
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_smd5;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_smd5;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_md5;
|
||||
|
||||
|
||||
#ifdef LUTIL_SHA1_BYTES
|
||||
static int chk_ssha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
|
||||
static int chk_sha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_ssha1;
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_sha1;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_sha1;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_ssha1;
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_LMHASH
|
||||
static int chk_lanman(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_lanman;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_lanman;
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_NS_MTA_MD5
|
||||
static int chk_ns_mta_md5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_ns_mta_md5;
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_SPASSWD
|
||||
static int chk_sasl(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_sasl;
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_KPASSWD
|
||||
static int chk_kerberos(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_kerberos;
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_CRYPT
|
||||
static int chk_crypt(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_crypt;
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_crypt;
|
||||
|
||||
#if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
|
||||
static int chk_unix(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred );
|
||||
static LUTIL_PASSWD_CHK_FUNC chk_unix;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef LUTIL_SHA1_BYTES
|
||||
/* password hash routines */
|
||||
static struct berval *hash_sha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
|
||||
static struct berval *hash_ssha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
#endif
|
||||
|
||||
static struct berval *hash_smd5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
|
||||
static struct berval *hash_md5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
|
||||
#ifdef SLAPD_LMHASH
|
||||
static struct berval *hash_lanman(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_CRYPT
|
||||
static struct berval *hash_crypt(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
#endif
|
||||
|
||||
#ifdef SLAPD_CLEARTEXT
|
||||
static struct berval *hash_clear(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *passwd );
|
||||
static LUTIL_PASSWD_HASH_FUNC hash_clear;
|
||||
#endif
|
||||
|
||||
static struct pw_slist *pw_schemes;
|
||||
|
||||
static const struct lutil_pw_scheme pw_schemes_default[] =
|
||||
static const struct pw_scheme pw_schemes_default[] =
|
||||
{
|
||||
#ifdef LUTIL_SHA1_BYTES
|
||||
{ BER_BVC("{SSHA}"), chk_ssha1, hash_ssha1 },
|
||||
|
|
@ -222,21 +172,26 @@ static const struct lutil_pw_scheme pw_schemes_default[] =
|
|||
#endif
|
||||
|
||||
#ifdef SLAPD_CLEARTEXT
|
||||
/* psuedo scheme */
|
||||
/* pseudo scheme */
|
||||
{ {0, "{CLEARTEXT}"}, NULL, hash_clear },
|
||||
#endif
|
||||
|
||||
{ BER_BVNULL, NULL, NULL }
|
||||
};
|
||||
|
||||
int lutil_passwd_add(struct lutil_pw_scheme *s)
|
||||
int lutil_passwd_add(
|
||||
struct berval *scheme,
|
||||
LUTIL_PASSWD_CHK_FUNC *chk,
|
||||
LUTIL_PASSWD_HASH_FUNC *hash )
|
||||
{
|
||||
struct pw_slist *ptr;
|
||||
|
||||
ptr = ber_memalloc( sizeof( struct pw_slist ));
|
||||
if (!ptr) return -1;
|
||||
ptr->next = pw_schemes;
|
||||
ptr->s = *s;
|
||||
ptr->s.name = *scheme;
|
||||
ptr->s.chk_fn = chk;
|
||||
ptr->s.hash_fn = hash;
|
||||
pw_schemes = ptr;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -244,10 +199,10 @@ int lutil_passwd_add(struct lutil_pw_scheme *s)
|
|||
void lutil_passwd_init()
|
||||
{
|
||||
struct pw_slist *ptr;
|
||||
struct lutil_pw_scheme *s;
|
||||
struct pw_scheme *s;
|
||||
|
||||
for( s=(struct lutil_pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
|
||||
if ( lutil_passwd_add( s )) break;
|
||||
for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
|
||||
if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn )) break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -261,7 +216,7 @@ void lutil_passwd_destroy()
|
|||
}
|
||||
}
|
||||
|
||||
static const struct lutil_pw_scheme *get_scheme(
|
||||
static const struct pw_scheme *get_scheme(
|
||||
const char* scheme )
|
||||
{
|
||||
struct pw_slist *pws;
|
||||
|
|
@ -305,7 +260,7 @@ static int is_allowed_scheme(
|
|||
}
|
||||
|
||||
static struct berval *passwd_scheme(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct pw_scheme *scheme,
|
||||
const struct berval * passwd,
|
||||
struct berval *bv,
|
||||
const char** allowed )
|
||||
|
|
@ -352,7 +307,7 @@ lutil_passwd(
|
|||
passwd, &x, schemes );
|
||||
|
||||
if( p != NULL ) {
|
||||
return (pws->s.chk_fn)( &(pws->s), p, cred );
|
||||
return (pws->s.chk_fn)( &(pws->s.name), p, cred );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -404,24 +359,24 @@ struct berval * lutil_passwd_hash(
|
|||
const struct berval * passwd,
|
||||
const char * method )
|
||||
{
|
||||
const struct lutil_pw_scheme *sc = get_scheme( method );
|
||||
const struct pw_scheme *sc = get_scheme( method );
|
||||
|
||||
if( sc == NULL ) return NULL;
|
||||
if( ! sc->hash_fn ) return NULL;
|
||||
|
||||
return (sc->hash_fn)( sc, passwd );
|
||||
return (sc->hash_fn)( &sc->name, passwd );
|
||||
}
|
||||
|
||||
/* pw_string is only called when SLAPD_LMHASH or SLAPD_CRYPT is defined */
|
||||
#if defined(SLAPD_LMHASH) || defined(SLAPD_CRYPT)
|
||||
static struct berval * pw_string(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
struct berval *pw = ber_memalloc( sizeof( struct berval ) );
|
||||
if( pw == NULL ) return NULL;
|
||||
|
||||
pw->bv_len = sc->name.bv_len + passwd->bv_len;
|
||||
pw->bv_len = sc->bv_len + passwd->bv_len;
|
||||
pw->bv_val = ber_memalloc( pw->bv_len + 1 );
|
||||
|
||||
if( pw->bv_val == NULL ) {
|
||||
|
|
@ -429,8 +384,8 @@ static struct berval * pw_string(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
AC_MEMCPY( pw->bv_val, sc->name.bv_val, sc->name.bv_len );
|
||||
AC_MEMCPY( &pw->bv_val[sc->name.bv_len], passwd->bv_val, passwd->bv_len );
|
||||
AC_MEMCPY( pw->bv_val, sc->bv_val, sc->bv_len );
|
||||
AC_MEMCPY( &pw->bv_val[sc->bv_len], passwd->bv_val, passwd->bv_len );
|
||||
|
||||
pw->bv_val[pw->bv_len] = '\0';
|
||||
return pw;
|
||||
|
|
@ -438,7 +393,7 @@ static struct berval * pw_string(
|
|||
#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
|
||||
|
||||
static struct berval * pw_string64(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval *hash,
|
||||
const struct berval *salt )
|
||||
{
|
||||
|
|
@ -470,7 +425,7 @@ static struct berval * pw_string64(
|
|||
}
|
||||
|
||||
b64len = LUTIL_BASE64_ENCODE_LEN( string.bv_len ) + 1;
|
||||
b64->bv_len = b64len + sc->name.bv_len;
|
||||
b64->bv_len = b64len + sc->bv_len;
|
||||
b64->bv_val = ber_memalloc( b64->bv_len + 1 );
|
||||
|
||||
if( b64->bv_val == NULL ) {
|
||||
|
|
@ -479,11 +434,11 @@ static struct berval * pw_string64(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
AC_MEMCPY(b64->bv_val, sc->name.bv_val, sc->name.bv_len);
|
||||
AC_MEMCPY(b64->bv_val, sc->bv_val, sc->bv_len);
|
||||
|
||||
rc = lutil_b64_ntop(
|
||||
string.bv_val, string.bv_len,
|
||||
&b64->bv_val[sc->name.bv_len], b64len );
|
||||
&b64->bv_val[sc->bv_len], b64len );
|
||||
|
||||
if( salt ) ber_memfree( string.bv_val );
|
||||
|
||||
|
|
@ -493,7 +448,7 @@ static struct berval * pw_string64(
|
|||
}
|
||||
|
||||
/* recompute length */
|
||||
b64->bv_len = sc->name.bv_len + rc;
|
||||
b64->bv_len = sc->bv_len + rc;
|
||||
assert( strlen(b64->bv_val) == b64->bv_len );
|
||||
return b64;
|
||||
}
|
||||
|
|
@ -502,7 +457,7 @@ static struct berval * pw_string64(
|
|||
|
||||
#ifdef LUTIL_SHA1_BYTES
|
||||
static int chk_ssha1(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -545,7 +500,7 @@ static int chk_ssha1(
|
|||
}
|
||||
|
||||
static int chk_sha1(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -581,7 +536,7 @@ static int chk_sha1(
|
|||
#endif
|
||||
|
||||
static int chk_smd5(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -625,7 +580,7 @@ static int chk_smd5(
|
|||
}
|
||||
|
||||
static int chk_md5(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -661,20 +616,20 @@ static int chk_md5(
|
|||
|
||||
#ifdef SLAPD_LMHASH
|
||||
static int chk_lanman(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred )
|
||||
{
|
||||
struct berval *hash;
|
||||
|
||||
hash = hash_lanman( scheme, cred );
|
||||
return memcmp( &hash->bv_val[scheme->name.bv_len], passwd->bv_val, 32);
|
||||
return memcmp( &hash->bv_val[scheme->bv_len], passwd->bv_val, 32);
|
||||
}
|
||||
#endif /* SLAPD_LMHASH */
|
||||
|
||||
#ifdef SLAPD_NS_MTA_MD5
|
||||
static int chk_ns_mta_md5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd,
|
||||
const struct berval *cred )
|
||||
{
|
||||
|
|
@ -726,7 +681,7 @@ sasl_conn_t *lutil_passwd_sasl_conn = NULL;
|
|||
#endif
|
||||
|
||||
static int chk_sasl(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -779,7 +734,7 @@ static int chk_sasl(
|
|||
|
||||
#ifdef SLAPD_KPASSWD
|
||||
static int chk_kerberos(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -952,7 +907,7 @@ static int chk_kerberos(
|
|||
|
||||
#ifdef SLAPD_CRYPT
|
||||
static int chk_crypt(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -995,7 +950,7 @@ static int chk_crypt(
|
|||
|
||||
# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
|
||||
static int chk_unix(
|
||||
const struct lutil_pw_scheme *sc,
|
||||
const struct berval *sc,
|
||||
const struct berval * passwd,
|
||||
const struct berval * cred )
|
||||
{
|
||||
|
|
@ -1071,7 +1026,7 @@ static int chk_unix(
|
|||
|
||||
#ifdef LUTIL_SHA1_BYTES
|
||||
static struct berval *hash_ssha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
lutil_SHA1_CTX SHA1context;
|
||||
|
|
@ -1100,7 +1055,7 @@ static struct berval *hash_ssha1(
|
|||
}
|
||||
|
||||
static struct berval *hash_sha1(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
lutil_SHA1_CTX SHA1context;
|
||||
|
|
@ -1119,7 +1074,7 @@ static struct berval *hash_sha1(
|
|||
#endif
|
||||
|
||||
static struct berval *hash_smd5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
lutil_MD5_CTX MD5context;
|
||||
|
|
@ -1148,7 +1103,7 @@ static struct berval *hash_smd5(
|
|||
}
|
||||
|
||||
static struct berval *hash_md5(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
lutil_MD5_CTX MD5context;
|
||||
|
|
@ -1245,7 +1200,7 @@ static void lmPasswd_to_key(
|
|||
}
|
||||
|
||||
static struct berval *hash_lanman(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
|
||||
|
|
@ -1293,7 +1248,7 @@ static struct berval *hash_lanman(
|
|||
|
||||
#ifdef SLAPD_CRYPT
|
||||
static struct berval *hash_crypt(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
struct berval hash;
|
||||
|
|
@ -1354,7 +1309,7 @@ int lutil_salt_format(const char *format)
|
|||
|
||||
#ifdef SLAPD_CLEARTEXT
|
||||
static struct berval *hash_clear(
|
||||
const struct lutil_pw_scheme *scheme,
|
||||
const struct berval *scheme,
|
||||
const struct berval *passwd )
|
||||
{
|
||||
return ber_bvdup( (struct berval *) passwd );
|
||||
|
|
|
|||
Loading…
Reference in a new issue