/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/string.h>
#include <ac/unistd.h>
-#ifdef SLAPD_SPASSWD
-# ifdef HAVE_SASL_SASL_H
-# include <sasl/sasl.h>
-# else
-# include <sasl.h>
-# endif
-#endif
-
#if defined(SLAPD_LMHASH)
# include <openssl/des.h>
#endif /* SLAPD_LMHASH */
#ifdef SLAPD_CRYPT
# include <ac/crypt.h>
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
# ifdef HAVE_SHADOW_H
# include <shadow.h>
# endif
#ifdef SLAPD_CRYPT
static char *salt_format = NULL;
+static lutil_cryptfunc lutil_crypt;
+lutil_cryptfunc *lutil_cryptptr = lutil_crypt;
#endif
+/* KLUDGE:
+ * chk_fn is NULL iff name is {CLEARTEXT}
+ * otherwise, things will break
+ */
struct pw_scheme {
struct berval name;
LUTIL_PASSWD_CHK_FUNC *chk_fn;
static LUTIL_PASSWD_HASH_FUNC hash_lanman;
#endif
-#ifdef SLAPD_SPASSWD
-static LUTIL_PASSWD_CHK_FUNC chk_sasl;
-#endif
-
#ifdef SLAPD_CRYPT
static LUTIL_PASSWD_CHK_FUNC chk_crypt;
static LUTIL_PASSWD_HASH_FUNC hash_crypt;
-#if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+#if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
static LUTIL_PASSWD_CHK_FUNC chk_unix;
#endif
#endif
#endif
static struct pw_slist *pw_schemes;
+static int pw_inited;
static const struct pw_scheme pw_schemes_default[] =
{
{ BER_BVC("{LANMAN}"), chk_lanman, hash_lanman },
#endif /* SLAPD_LMHASH */
-#ifdef SLAPD_SPASSWD
- { BER_BVC("{SASL}"), chk_sasl, NULL },
-#endif
-
#ifdef SLAPD_CRYPT
{ BER_BVC("{CRYPT}"), chk_crypt, hash_crypt },
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
{ BER_BVC("{UNIX}"), chk_unix, NULL },
# endif
#endif
#ifdef SLAPD_CLEARTEXT
/* pseudo scheme */
- { {0, "{CLEARTEXT}"}, NULL, hash_clear },
+ { BER_BVC("{CLEARTEXT}"), NULL, hash_clear },
#endif
{ BER_BVNULL, NULL, NULL }
{
struct pw_slist *ptr;
+ if (!pw_inited) lutil_passwd_init();
+
ptr = ber_memalloc( sizeof( struct pw_slist ));
if (!ptr) return -1;
ptr->next = pw_schemes;
void lutil_passwd_init()
{
- struct pw_slist *ptr;
struct pw_scheme *s;
+ pw_inited = 1;
+
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;
+ if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn ) ) break;
}
}
const char* scheme )
{
struct pw_slist *pws;
+ struct berval bv;
+
+ if (!pw_inited) lutil_passwd_init();
- if (!pw_schemes) lutil_passwd_init();
+ bv.bv_val = strchr( scheme, '}' );
+ if ( !bv.bv_val )
+ return NULL;
+
+ bv.bv_len = bv.bv_val - scheme + 1;
+ bv.bv_val = (char *) scheme;
for( pws=pw_schemes; pws; pws=pws->next ) {
- if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) {
+ if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
return &(pws->s);
}
}
return -1;
}
- if (!pw_schemes) lutil_passwd_init();
+ if (!pw_inited) lutil_passwd_init();
for( pws=pw_schemes; pws; pws=pws->next ) {
if( pws->s.chk_fn ) {
}
#ifdef SLAPD_CLEARTEXT
+ /* Do we think there is a scheme specifier here that we
+ * didn't recognize? Assume a scheme name is at least 1 character.
+ */
+ if (( passwd->bv_val[0] == '{' ) &&
+ ( ber_bvchr( passwd, '}' ) > passwd->bv_val+1 ))
+ {
+ return 1;
+ }
if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
- return (( passwd->bv_len == cred->bv_len ) &&
- ( passwd->bv_val[0] != '{' /*'}'*/ ))
- ? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
+ return ( passwd->bv_len == cred->bv_len ) ?
+ memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
: 1;
}
#endif
#if defined(SLAPD_LMHASH) || defined(SLAPD_CRYPT)
static int pw_string(
const struct berval *sc,
- const struct berval *passwd )
+ struct berval *passwd )
{
struct berval pw;
- pw->bv_len = sc->bv_len + passwd->bv_len;
- pw->bv_val = ber_memalloc( pw->bv_len + 1 );
+ pw.bv_len = sc->bv_len + passwd->bv_len;
+ pw.bv_val = ber_memalloc( pw.bv_len + 1 );
- if( pw->bv_val == NULL ) {
- return -1;
+ if( pw.bv_val == NULL ) {
+ return LUTIL_PASSWD_ERR;
}
AC_MEMCPY( pw.bv_val, sc->bv_val, sc->bv_len );
pw.bv_val[pw.bv_len] = '\0';
*passwd = pw;
- return 0;
+ return LUTIL_PASSWD_OK;
}
#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
string.bv_val = ber_memalloc( string.bv_len + 1 );
if( string.bv_val == NULL ) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
AC_MEMCPY( string.bv_val, hash->bv_val,
if( b64->bv_val == NULL ) {
if( salt ) ber_memfree( string.bv_val );
- return -1;
+ return LUTIL_PASSWD_ERR;
}
AC_MEMCPY(b64->bv_val, sc->bv_val, sc->bv_len);
if( salt ) ber_memfree( string.bv_val );
if( rc < 0 ) {
- return rc;
+ return LUTIL_PASSWD_ERR;
}
/* recompute length */
b64->bv_len = sc->bv_len + rc;
assert( strlen(b64->bv_val) == b64->bv_len );
- return 0;
+ return LUTIL_PASSWD_OK;
}
/* PASSWORD CHECK ROUTINES */
int rc;
unsigned char *orig_pass = NULL;
- /* safety check */
- if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <
- sizeof(SHA1digest)+SALT_SIZE) {
- return -1;
+ /* safety check -- must have some salt */
+ if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <= sizeof(SHA1digest)) {
+ return LUTIL_PASSWD_ERR;
}
/* decode base64 password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
- if (rc < (int)(sizeof(SHA1digest)+SALT_SIZE)) {
+ /* safety check -- must have some salt */
+ if (rc <= (int)(sizeof(SHA1digest))) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
/* compare */
rc = memcmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
ber_memfree(orig_pass);
- return rc ? 1 : 0;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
static int chk_sha1(
/* safety check */
if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) < sizeof(SHA1digest)) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
if( rc != sizeof(SHA1digest) ) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
/* compare */
rc = memcmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
ber_memfree(orig_pass);
- return rc ? 1 : 0;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
#endif
unsigned char *orig_pass = NULL;
/* safety check */
- if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <
- sizeof(MD5digest)+SALT_SIZE) {
- return -1;
+ if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <= sizeof(MD5digest)) {
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
- if (rc < (int)(sizeof(MD5digest)+SALT_SIZE)) {
+ if (rc <= (int)(sizeof(MD5digest))) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
/* compare */
rc = memcmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
ber_memfree(orig_pass);
- return rc ? 1 : 0;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
static int chk_md5(
/* safety check */
if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) < sizeof(MD5digest)) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
if ( rc != sizeof(MD5digest) ) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
/* compare */
rc = memcmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
ber_memfree(orig_pass);
- return rc ? 1 : 0;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
#ifdef SLAPD_LMHASH
*/
static void lmPasswd_to_key(
- const unsigned char *lmPasswd,
+ const char *lmPasswd,
des_cblock *key)
{
+ const unsigned char *lpw = (const unsigned char *) lmPasswd;
+ unsigned char *k = (unsigned char *) key;
+
/* make room for parity bits */
- ((char *)key)[0] = lmPasswd[0];
- ((char *)key)[1] = ((lmPasswd[0]&0x01)<<7) | (lmPasswd[1]>>1);
- ((char *)key)[2] = ((lmPasswd[1]&0x03)<<6) | (lmPasswd[2]>>2);
- ((char *)key)[3] = ((lmPasswd[2]&0x07)<<5) | (lmPasswd[3]>>3);
- ((char *)key)[4] = ((lmPasswd[3]&0x0F)<<4) | (lmPasswd[4]>>4);
- ((char *)key)[5] = ((lmPasswd[4]&0x1F)<<3) | (lmPasswd[5]>>5);
- ((char *)key)[6] = ((lmPasswd[5]&0x3F)<<2) | (lmPasswd[6]>>6);
- ((char *)key)[7] = ((lmPasswd[6]&0x7F)<<1);
+ k[0] = lpw[0];
+ k[1] = ((lpw[0] & 0x01) << 7) | (lpw[1] >> 1);
+ k[2] = ((lpw[1] & 0x03) << 6) | (lpw[2] >> 2);
+ k[3] = ((lpw[2] & 0x07) << 5) | (lpw[3] >> 3);
+ k[4] = ((lpw[3] & 0x0F) << 4) | (lpw[4] >> 4);
+ k[5] = ((lpw[4] & 0x1F) << 3) | (lpw[5] >> 5);
+ k[6] = ((lpw[5] & 0x3F) << 2) | (lpw[6] >> 6);
+ k[7] = ((lpw[6] & 0x7F) << 1);
des_set_odd_parity( key );
}
for( i=0; i<cred->bv_len; i++) {
if(cred->bv_val[i] == '\0') {
- return -1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( cred->bv_val[i] != '\0' ) {
- return -1; /* passwd must behave like a string */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
strncpy( UcasePassword, cred->bv_val, 14 );
storedPasswordHash[32] = '\0';
ldap_pvt_str2lower( storedPasswordHash );
- return memcmp( PasswordHash, storedPasswordHash, 32) ? 1 : 0;
+ return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
#endif /* SLAPD_LMHASH */
-#ifdef SLAPD_SPASSWD
-#ifdef HAVE_CYRUS_SASL
-sasl_conn_t *lutil_passwd_sasl_conn = NULL;
-#endif
-
-static int chk_sasl(
- const struct berval *sc,
- const struct berval * passwd,
- const struct berval * cred,
- const char **text )
+#ifdef SLAPD_CRYPT
+static int lutil_crypt(
+ const char *key,
+ const char *salt,
+ char **hash )
{
- unsigned int i;
- int rtn;
-
- for( i=0; i<cred->bv_len; i++) {
- if(cred->bv_val[i] == '\0') {
- return 1; /* NUL character in password */
- }
- }
-
- if( cred->bv_val[i] != '\0' ) {
- return 1; /* cred must behave like a string */
- }
+ char *cr = crypt( key, salt );
+ int rc;
- for( i=0; i<passwd->bv_len; i++) {
- if(passwd->bv_val[i] == '\0') {
- return 1; /* NUL character in password */
+ if( cr == NULL || cr[0] == '\0' ) {
+ /* salt must have been invalid */
+ rc = LUTIL_PASSWD_ERR;
+ } else {
+ if ( hash ) {
+ *hash = ber_strdup( cr );
+ rc = LUTIL_PASSWD_OK;
+ } else {
+ rc = strcmp( salt, cr ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
}
-
- if( passwd->bv_val[i] != '\0' ) {
- return 1; /* passwd must behave like a string */
- }
-
- rtn = 1;
-
-#ifdef HAVE_CYRUS_SASL
- if( lutil_passwd_sasl_conn != NULL ) {
- int sc;
-# if SASL_VERSION_MAJOR < 2
- sc = sasl_checkpass( lutil_passwd_sasl_conn,
- passwd->bv_val, passwd->bv_len,
- cred->bv_val, cred->bv_len,
- text );
-# else
- sc = sasl_checkpass( lutil_passwd_sasl_conn,
- passwd->bv_val, passwd->bv_len,
- cred->bv_val, cred->bv_len );
-# endif
- rtn = ( sc != SASL_OK );
- }
-#endif
-
- return rtn;
+ return rc;
}
-#endif
-#ifdef SLAPD_CRYPT
static int chk_crypt(
const struct berval *sc,
const struct berval * passwd,
const struct berval * cred,
const char **text )
{
- char *cr;
unsigned int i;
for( i=0; i<cred->bv_len; i++) {
if(cred->bv_val[i] == '\0') {
- return 1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( cred->bv_val[i] != '\0' ) {
- return -1; /* cred must behave like a string */
+ return LUTIL_PASSWD_ERR; /* cred must behave like a string */
}
if( passwd->bv_len < 2 ) {
- return -1; /* passwd must be at least two characters long */
+ return LUTIL_PASSWD_ERR; /* passwd must be at least two characters long */
}
for( i=0; i<passwd->bv_len; i++) {
if(passwd->bv_val[i] == '\0') {
- return -1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( passwd->bv_val[i] != '\0' ) {
- return -1; /* passwd must behave like a string */
- }
-
- cr = crypt( cred->bv_val, passwd->bv_val );
-
- if( cr == NULL || cr[0] == '\0' ) {
- /* salt must have been invalid */
- return -1;
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
- return strcmp( passwd->bv_val, cr ) ? 1 : 0;
+ return lutil_cryptptr( cred->bv_val, passwd->bv_val, NULL );
}
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
static int chk_unix(
const struct berval *sc,
const struct berval * passwd,
const char **text )
{
unsigned int i;
- char *pw,*cr;
+ char *pw;
for( i=0; i<cred->bv_len; i++) {
if(cred->bv_val[i] == '\0') {
- return -1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( cred->bv_val[i] != '\0' ) {
- return -1; /* cred must behave like a string */
+ return LUTIL_PASSWD_ERR; /* cred must behave like a string */
}
for( i=0; i<passwd->bv_len; i++) {
if(passwd->bv_val[i] == '\0') {
- return -1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( passwd->bv_val[i] != '\0' ) {
- return -1; /* passwd must behave like a string */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
{
struct passwd *pwd = getpwnam(passwd->bv_val);
if(pwd == NULL) {
- return -1; /* not found */
+ return LUTIL_PASSWD_ERR; /* not found */
}
pw = pwd->pw_passwd;
if( pw == NULL || pw[0] == '\0' || pw[1] == '\0' ) {
/* password must must be at least two characters long */
- return -1;
- }
-
- cr = crypt(cred->bv_val, pw);
-
- if( cr == NULL || cr[0] == '\0' ) {
- /* salt must have been invalid */
- return -1;
+ return LUTIL_PASSWD_ERR;
}
- return strcmp(pw, cr) ? 1 : 0;
-
+ return lutil_cryptptr( cred->bv_val, pw, NULL );
}
# endif
#endif
salt.bv_len = sizeof(saltdata);
if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
lutil_SHA1Init( &SHA1context );
salt.bv_len = sizeof(saltdata);
if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
lutil_MD5Init( &MD5context );
for( i=0; i<passwd->bv_len; i++) {
if(passwd->bv_val[i] == '\0') {
- return -1; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( passwd->bv_val[i] != '\0' ) {
- return -1; /* passwd must behave like a string */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
strncpy( UcasePassword, passwd->bv_val, 14 );
{
unsigned char salt[32]; /* salt suitable for most anything */
unsigned int i;
+ char *save;
+ int rc;
for( i=0; i<passwd->bv_len; i++) {
if(passwd->bv_val[i] == '\0') {
- return NULL; /* NUL character in password */
+ return LUTIL_PASSWD_ERR; /* NUL character in password */
}
}
if( passwd->bv_val[i] != '\0' ) {
- return NULL; /* passwd must behave like a string */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
if( lutil_entropy( salt, sizeof( salt ) ) < 0 ) {
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
for( i=0; i< ( sizeof(salt) - 1 ); i++ ) {
snprintf( (char *) salt, sizeof(entropy), salt_format, entropy );
}
- hash->bv_val = crypt( passwd->bv_val, (char *) salt );
+ rc = lutil_cryptptr( passwd->bv_val, (char *) salt, &hash->bv_val );
+ if ( rc != LUTIL_PASSWD_OK ) return rc;
- if( hash->bv_val == NULL ) return NULL;
+ if( hash->bv_val == NULL ) return -1;
hash->bv_len = strlen( hash->bv_val );
+ save = hash->bv_val;
+
if( hash->bv_len == 0 ) {
- return -1;
+ rc = LUTIL_PASSWD_ERR;
+ } else {
+ rc = pw_string( scheme, hash );
}
-
- return pw_string( scheme, hash );
+ ber_memfree( save );
+ return rc;
}
#endif
#ifdef SLAPD_CRYPT
free( salt_format );
- salt_format = format != NULL ? strdup( format ) : NULL;
+ salt_format = format != NULL ? ber_strdup( format ) : NULL;
#endif
return 0;
const char **text )
{
ber_dupbv( hash, (struct berval *)passwd );
- return 0;
+ return LUTIL_PASSWD_OK;
}
#endif
projects / openldap / blobdiff