]> git.sur5r.net Git - openldap/blobdiff - libraries/liblutil/passwd.c
From HEAD
[openldap] / libraries / liblutil / passwd.c
index d350770ef94e47d5497d383776efb88618423306..f16b49a2bc3f9d79f9b8717f175e3b8646458728 100644 (file)
@@ -1,13 +1,26 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 /*
- * lutil_password(credentials, password)
+ * int lutil_passwd(
+ *     const struct berval *passwd,
+ *     const struct berval *cred,
+ *     const char **schemes )
  *
- * Returns true if user supplied credentials matches
- * the stored password. 
+ * Returns true if user supplied credentials (cred) matches
+ * the stored password (passwd)
  *
  * Due to the use of the crypt(3) function 
  * this routine is NOT thread-safe.
 
 #include "portable.h"
 
+#include <stdio.h>
 #include <ac/stdlib.h>
-
 #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 */
+
+#include <ac/param.h>
+
+#ifdef SLAPD_CRYPT
+# include <ac/crypt.h>
+
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+#  ifdef HAVE_SHADOW_H
+#      include <shadow.h>
+#  endif
+#  ifdef HAVE_PWD_H
+#      include <pwd.h>
+#  endif
+#  ifdef HAVE_AIX_SECURITY
+#      include <userpw.h>
+#  endif
+# endif
+#endif
+
+#include <lber.h>
+
+#include "ldap_pvt.h"
+#include "lber_pvt.h"
+
 #include "lutil_md5.h"
 #include "lutil_sha1.h"
 #include "lutil.h"
 
-#ifdef HAVE_SHADOW_H
-#      include <shadow.h>
+static const unsigned char crypt64[] =
+       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890./";
+
+#ifdef SLAPD_CRYPT
+static char *salt_format = NULL;
 #endif
-#ifdef HAVE_PWD_H
-#      include <pwd.h>
+
+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 pw_scheme s;
+};
+
+/* password check routines */
+
+#define        SALT_SIZE       4
+
+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 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
 
-static int supported_hash(
-       const char* method,
-       const char** methods )
+#ifdef SLAPD_LMHASH
+static LUTIL_PASSWD_CHK_FUNC chk_lanman;
+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 )
+static LUTIL_PASSWD_CHK_FUNC chk_unix;
+#endif
+#endif
+
+/* password hash routines */
+
+#ifdef SLAPD_CLEARTEXT
+static LUTIL_PASSWD_HASH_FUNC hash_clear;
+#endif
+
+static struct pw_slist *pw_schemes;
+
+static const struct pw_scheme pw_schemes_default[] =
 {
-       int i;
+#ifdef LUTIL_SHA1_BYTES
+       { BER_BVC("{SSHA}"),            chk_ssha1, hash_ssha1 },
+       { BER_BVC("{SHA}"),                     chk_sha1, hash_sha1 },
+#endif
+
+       { BER_BVC("{SMD5}"),            chk_smd5, hash_smd5 },
+       { BER_BVC("{MD5}"),                     chk_md5, hash_md5 },
+
+#ifdef SLAPD_LMHASH
+       { 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 )
+       { BER_BVC("{UNIX}"),            chk_unix, NULL },
+# endif
+#endif
+
+#ifdef SLAPD_CLEARTEXT
+       /* pseudo scheme */
+       { {0, "{CLEARTEXT}"},           NULL, hash_clear },
+#endif
+
+       { BER_BVNULL, NULL, NULL }
+};
+
+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.name = *scheme;
+       ptr->s.chk_fn = chk;
+       ptr->s.hash_fn = hash;
+       pw_schemes = ptr;
+       return 0;
+}
+
+void lutil_passwd_init()
+{
+       struct pw_scheme *s;
 
-       if(methods == NULL) {
-               return 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;
        }
+}
 
-       for(i=0; methods[i] != NULL; i++) {
-               if(strcasecmp(method, methods[i]) == 0) {
-                       return 1;
+void lutil_passwd_destroy()
+{
+       struct pw_slist *ptr, *next;
+
+       for( ptr=pw_schemes; ptr; ptr=next ) {
+               next = ptr->next;
+               ber_memfree( ptr );
+       }
+}
+
+static const struct pw_scheme *get_scheme(
+       const char* scheme )
+{
+       struct pw_slist *pws;
+
+       if (!pw_schemes) lutil_passwd_init();
+
+       for( pws=pw_schemes; pws; pws=pws->next ) {
+               if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) {
+                       return &(pws->s);
                }
        }
 
-       return 0;
+       return NULL;
+}
+
+int lutil_passwd_scheme(
+       const char* scheme )
+{
+       if( scheme == NULL ) {
+               return 0;
+       }
+
+       return get_scheme(scheme) != NULL;
 }
 
-static const char *passwd_hash(
-       const char* passwd,
-       const char* method,
-       const char** methods )
+
+static int is_allowed_scheme( 
+       const char* scheme,
+       const char** schemes )
 {
-       int len;
+       int i;
+
+       if( schemes == NULL ) return 1;
 
-       if( !supported_hash( method, methods ) ) {
+       for( i=0; schemes[i] != NULL; i++ ) {
+               if( strcasecmp( scheme, schemes[i] ) == 0 ) {
+                       return 1;
+               }
+       }
+       return 0;
+}
+
+static struct berval *passwd_scheme(
+       const struct pw_scheme *scheme,
+       const struct berval * passwd,
+       struct berval *bv,
+       const char** allowed )
+{
+       if( !is_allowed_scheme( scheme->name.bv_val, allowed ) ) {
                return NULL;
        }
 
-       len = strlen(method);
+       if( passwd->bv_len >= scheme->name.bv_len ) {
+               if( strncasecmp( passwd->bv_val, scheme->name.bv_val, scheme->name.bv_len ) == 0 ) {
+                       bv->bv_val = &passwd->bv_val[scheme->name.bv_len];
+                       bv->bv_len = passwd->bv_len - scheme->name.bv_len;
 
-       if( strncasecmp( passwd, method, len ) == 0 ) {
-               return &passwd[len];
+                       return bv;
+               }
        }
 
        return NULL;
@@ -75,144 +272,889 @@ static const char *passwd_hash(
  */
 int
 lutil_passwd(
-       const char *cred,
-       const char *passwd,
-       const char **methods)
+       const struct berval *passwd,    /* stored passwd */
+       const struct berval *cred,              /* user cred */
+       const char **schemes,
+       const char **text )
 {
-       const char *p;
+       struct pw_slist *pws;
 
-       if (cred == NULL || passwd == NULL) {
+       if ( text ) *text = NULL;
+
+       if (cred == NULL || cred->bv_len == 0 ||
+               passwd == NULL || passwd->bv_len == 0 )
+       {
                return -1;
        }
 
-       if ((p = passwd_hash( passwd, "{MD5}", methods )) != NULL ) {
-               lutil_MD5_CTX MD5context;
-               unsigned char MD5digest[16];
-               char base64digest[25];  /* ceiling(sizeof(input)/3) * 4 + 1 */
+       if (!pw_schemes) lutil_passwd_init();
 
-               lutil_MD5Init(&MD5context);
-               lutil_MD5Update(&MD5context,
-                              (const unsigned char *)cred, strlen(cred));
-               lutil_MD5Final(MD5digest, &MD5context);
+       for( pws=pw_schemes; pws; pws=pws->next ) {
+               if( pws->s.chk_fn ) {
+                       struct berval x;
+                       struct berval *p = passwd_scheme( &(pws->s),
+                               passwd, &x, schemes );
 
-               if ( lutil_b64_ntop(MD5digest, sizeof(MD5digest),
-                       base64digest, sizeof(base64digest)) < 0)
-               {
-                       return ( 1 );
+                       if( p != NULL ) {
+                               return (pws->s.chk_fn)( &(pws->s.name), p, cred, text );
+                       }
                }
+       }
 
-               return( strcmp(p, base64digest) );
+#ifdef SLAPD_CLEARTEXT
+       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 )
+                       : 1;
+       }
+#endif
+       return 1;
+}
 
-       } else if ((p = passwd_hash( passwd, "{SHA}", methods )) != NULL ) {
-               lutil_SHA1_CTX SHA1context;
-               unsigned char SHA1digest[20];
-               char base64digest[29];  /* ceiling(sizeof(input)/3) * 4 + 1 */
+int lutil_passwd_generate( struct berval *pw, ber_len_t len )
+{
+
+       if( len < 1 ) return -1;
+
+       pw->bv_len = len;
+       pw->bv_val = ber_memalloc( len + 1 );
 
-               lutil_SHA1Init(&SHA1context);
-               lutil_SHA1Update(&SHA1context,
-                               (const unsigned char *) cred, strlen(cred));
-               lutil_SHA1Final(SHA1digest, &SHA1context);
+       if( pw->bv_val == NULL ) {
+               return -1;
+       }
+
+       if( lutil_entropy( (unsigned char *) pw->bv_val, pw->bv_len) < 0 ) {
+               return -1; 
+       }
+
+       for( len = 0; len < pw->bv_len; len++ ) {
+               pw->bv_val[len] = crypt64[
+                       pw->bv_val[len] % (sizeof(crypt64)-1) ];
+       }
+
+       pw->bv_val[len] = '\0';
+       
+       return 0;
+}
+
+int lutil_passwd_hash(
+       const struct berval * passwd,
+       const char * method,
+       struct berval *hash,
+       const char **text )
+{
+       const struct pw_scheme *sc = get_scheme( method );
+
+       hash->bv_val = NULL;
+       hash->bv_len = 0;
+
+       if( sc == NULL ) {
+               if( text ) *text = "scheme not recognized";
+               return -1;
+       }
+
+       if( ! sc->hash_fn ) {
+               if( text ) *text = "scheme provided no hash function";
+               return -1;
+       }
+
+       if( text ) *text = NULL;
+
+       return (sc->hash_fn)( &sc->name, passwd, hash, text );
+}
+
+/* pw_string is only called when SLAPD_LMHASH or SLAPD_CRYPT is defined */
+#if defined(SLAPD_LMHASH) || defined(SLAPD_CRYPT)
+static int pw_string(
+       const struct berval *sc,
+       struct berval *passwd )
+{
+       struct berval pw;
 
-               if (lutil_b64_ntop(SHA1digest, sizeof(SHA1digest),
-                       base64digest, sizeof(base64digest)) < 0)
-               {
-                       return ( 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 LUTIL_PASSWD_ERR;
+       }
+
+       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';
+       *passwd = pw;
+
+       return LUTIL_PASSWD_OK;
+}
+#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
+
+static int pw_string64(
+       const struct berval *sc,
+       const struct berval *hash,
+       struct berval *b64,
+       const struct berval *salt )
+{
+       int rc;
+       struct berval string;
+       size_t b64len;
+
+       if( salt ) {
+               /* need to base64 combined string */
+               string.bv_len = hash->bv_len + salt->bv_len;
+               string.bv_val = ber_memalloc( string.bv_len + 1 );
+
+               if( string.bv_val == NULL ) {
+                       return LUTIL_PASSWD_ERR;
                }
 
-               return( strcmp(p, base64digest) );
+               AC_MEMCPY( string.bv_val, hash->bv_val,
+                       hash->bv_len );
+               AC_MEMCPY( &string.bv_val[hash->bv_len], salt->bv_val,
+                       salt->bv_len );
+               string.bv_val[string.bv_len] = '\0';
+
+       } else {
+               string = *hash;
+       }
+
+       b64len = LUTIL_BASE64_ENCODE_LEN( string.bv_len ) + 1;
+       b64->bv_len = b64len + sc->bv_len;
+       b64->bv_val = ber_memalloc( b64->bv_len + 1 );
+
+       if( b64->bv_val == NULL ) {
+               if( salt ) ber_memfree( string.bv_val );
+               return LUTIL_PASSWD_ERR;
+       }
+
+       AC_MEMCPY(b64->bv_val, sc->bv_val, sc->bv_len);
+
+       rc = lutil_b64_ntop(
+               (unsigned char *) string.bv_val, string.bv_len,
+               &b64->bv_val[sc->bv_len], b64len );
+
+       if( salt ) ber_memfree( string.bv_val );
+       
+       if( rc < 0 ) {
+               return LUTIL_PASSWD_ERR;
+       }
+
+       /* recompute length */
+       b64->bv_len = sc->bv_len + rc;
+       assert( strlen(b64->bv_val) == b64->bv_len );
+       return LUTIL_PASSWD_OK;
+}
+
+/* PASSWORD CHECK ROUTINES */
+
+#ifdef LUTIL_SHA1_BYTES
+static int chk_ssha1(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       lutil_SHA1_CTX SHA1context;
+       unsigned char SHA1digest[LUTIL_SHA1_BYTES];
+       int rc;
+       unsigned char *orig_pass = NULL;
+
+       /* 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) );
 
-       } else if ((p = passwd_hash( passwd, "{SSHA}", methods )) != NULL ) {
-               lutil_SHA1_CTX SHA1context;
-               unsigned char SHA1digest[20];
-               int pw_len = strlen(p);
-               int rc;
-               unsigned char *orig_pass = NULL;
+       if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
+
+       rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
+
+       /* safety check -- must have some salt */
+       if (rc <= (int)(sizeof(SHA1digest))) {
+               ber_memfree(orig_pass);
+               return LUTIL_PASSWD_ERR;
+       }
  
-               /* base64 un-encode password */
-               orig_pass = (unsigned char *)malloc((size_t)(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->bv_val, cred->bv_len);
+       lutil_SHA1Update(&SHA1context,
+               (const unsigned char *) &orig_pass[sizeof(SHA1digest)],
+               rc - sizeof(SHA1digest));
+       lutil_SHA1Final(SHA1digest, &SHA1context);
  
-               /* 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 = memcmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
+       ber_memfree(orig_pass);
+       return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+}
+
+static int chk_sha1(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       lutil_SHA1_CTX SHA1context;
+       unsigned char SHA1digest[LUTIL_SHA1_BYTES];
+       int rc;
+       unsigned char *orig_pass = NULL;
  
-               /* compare */
-               rc = memcmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
-               free(orig_pass);
-               return(rc);
-
-       } else if ((p = passwd_hash( passwd, "{SMD5}", methods )) != NULL ) {
-               lutil_MD5_CTX MD5context;
-               unsigned char MD5digest[16];
-               int pw_len = strlen(p);
-               int rc;
-               unsigned char *orig_pass = NULL;
-
-               /* base64 un-encode password */
-               orig_pass = (unsigned char *)malloc((size_t)(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 = memcmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
-               free(orig_pass);
-               return ( rc );
+       /* safety check */
+       if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) < sizeof(SHA1digest)) {
+               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 LUTIL_PASSWD_ERR;
+
+       rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
+
+       if( rc != sizeof(SHA1digest) ) {
+               ber_memfree(orig_pass);
+               return LUTIL_PASSWD_ERR;
+       }
+       /* hash credentials with salt */
+       lutil_SHA1Init(&SHA1context);
+       lutil_SHA1Update(&SHA1context,
+               (const unsigned char *) cred->bv_val, cred->bv_len);
+       lutil_SHA1Final(SHA1digest, &SHA1context);
+       /* compare */
+       rc = memcmp((char *)orig_pass, (char *)SHA1digest, sizeof(SHA1digest));
+       ber_memfree(orig_pass);
+       return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+}
+#endif
+
+static int chk_smd5(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       lutil_MD5_CTX MD5context;
+       unsigned char MD5digest[LUTIL_MD5_BYTES];
+       int rc;
+       unsigned char *orig_pass = NULL;
+
+       /* safety check */
+       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 LUTIL_PASSWD_ERR;
+
+       rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
+
+       if (rc <= (int)(sizeof(MD5digest))) {
+               ber_memfree(orig_pass);
+               return LUTIL_PASSWD_ERR;
+       }
+
+       /* hash credentials with salt */
+       lutil_MD5Init(&MD5context);
+       lutil_MD5Update(&MD5context,
+               (const unsigned char *) cred->bv_val,
+               cred->bv_len );
+       lutil_MD5Update(&MD5context,
+               &orig_pass[sizeof(MD5digest)],
+               rc - sizeof(MD5digest));
+       lutil_MD5Final(MD5digest, &MD5context);
+
+       /* compare */
+       rc = memcmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
+       ber_memfree(orig_pass);
+       return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+}
+
+static int chk_md5(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       lutil_MD5_CTX MD5context;
+       unsigned char MD5digest[LUTIL_MD5_BYTES];
+       int rc;
+       unsigned char *orig_pass = NULL;
+
+       /* safety check */
+       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 LUTIL_PASSWD_ERR;
+
+       rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
+       if ( rc != sizeof(MD5digest) ) {
+               ber_memfree(orig_pass);
+               return LUTIL_PASSWD_ERR;
+       }
+
+       /* hash credentials with salt */
+       lutil_MD5Init(&MD5context);
+       lutil_MD5Update(&MD5context,
+               (const unsigned char *) cred->bv_val,
+               cred->bv_len );
+       lutil_MD5Final(MD5digest, &MD5context);
+
+       /* compare */
+       rc = memcmp((char *)orig_pass, (char *)MD5digest, sizeof(MD5digest));
+       ber_memfree(orig_pass);
+       return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+}
+
+#ifdef SLAPD_LMHASH
+/* pseudocode from RFC2433
+ * A.2 LmPasswordHash()
+ * 
+ *    LmPasswordHash(
+ *    IN  0-to-14-oem-char Password,
+ *    OUT 16-octet         PasswordHash )
+ *    {
+ *       Set UcasePassword to the uppercased Password
+ *       Zero pad UcasePassword to 14 characters
+ * 
+ *       DesHash( 1st 7-octets of UcasePassword,
+ *                giving 1st 8-octets of PasswordHash )
+ * 
+ *       DesHash( 2nd 7-octets of UcasePassword,
+ *                giving 2nd 8-octets of PasswordHash )
+ *    }
+ * 
+ * 
+ * A.3 DesHash()
+ * 
+ *    DesHash(
+ *    IN  7-octet Clear,
+ *    OUT 8-octet Cypher )
+ *    {
+ *        *
+ *        * Make Cypher an irreversibly encrypted form of Clear by
+ *        * encrypting known text using Clear as the secret key.
+ *        * The known text consists of the string
+ *        *
+ *        *              KGS!@#$%
+ *        *
+ * 
+ *       Set StdText to "KGS!@#$%"
+ *       DesEncrypt( StdText, Clear, giving Cypher )
+ *    }
+ * 
+ * 
+ * A.4 DesEncrypt()
+ * 
+ *    DesEncrypt(
+ *    IN  8-octet Clear,
+ *    IN  7-octet Key,
+ *    OUT 8-octet Cypher )
+ *    {
+ *        *
+ *        * Use the DES encryption algorithm [4] in ECB mode [9]
+ *        * to encrypt Clear into Cypher such that Cypher can
+ *        * only be decrypted back to Clear by providing Key.
+ *        * Note that the DES algorithm takes as input a 64-bit
+ *        * stream where the 8th, 16th, 24th, etc.  bits are
+ *        * parity bits ignored by the encrypting algorithm.
+ *        * Unless you write your own DES to accept 56-bit input
+ *        * without parity, you will need to insert the parity bits
+ *        * yourself.
+ *        *
+ *    }
+ */
+
+static void lmPasswd_to_key(
+       const unsigned char *lmPasswd,
+       des_cblock *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);
+               
+       des_set_odd_parity( key );
+}      
+
+static int chk_lanman(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       const struct berval *cred,
+       const char **text )
+{
+       int i;
+       char UcasePassword[15];
+       des_cblock key;
+       des_key_schedule schedule;
+       des_cblock StdText = "KGS!@#$%";
+       des_cblock PasswordHash1, PasswordHash2;
+       char PasswordHash[33], storedPasswordHash[33];
+       
+       for( i=0; i<cred->bv_len; i++) {
+               if(cred->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+       
+       if( cred->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must behave like a string */
+       }
+       
+       strncpy( UcasePassword, cred->bv_val, 14 );
+       UcasePassword[14] = '\0';
+       ldap_pvt_str2upper( UcasePassword );
+       
+       lmPasswd_to_key( UcasePassword, &key );
+       des_set_key_unchecked( &key, schedule );
+       des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
+       
+       lmPasswd_to_key( &UcasePassword[7], &key );
+       des_set_key_unchecked( &key, schedule );
+       des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
+       
+       sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", 
+               PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
+               PasswordHash1[4],PasswordHash1[5],PasswordHash1[6],PasswordHash1[7],
+               PasswordHash2[0],PasswordHash2[1],PasswordHash2[2],PasswordHash2[3],
+               PasswordHash2[4],PasswordHash2[5],PasswordHash2[6],PasswordHash2[7] );
+       
+       /* as a precaution convert stored password hash to lower case */
+       strncpy( storedPasswordHash, passwd->bv_val, 32 );
+       storedPasswordHash[32] = '\0';
+       ldap_pvt_str2lower( storedPasswordHash );
+       
+       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 )
+{
+       unsigned int i;
+       int rtn;
+
+       for( i=0; i<cred->bv_len; i++) {
+               if(cred->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+
+       if( cred->bv_val[i] != '\0' ) {
+               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 LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+
+       if( passwd->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must behave like a string */
+       }
+
+       rtn = LUTIL_PASSWD_ERR;
+
+#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 ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+       }
+#endif
+
+       return rtn;
+}
+#endif
 
 #ifdef SLAPD_CRYPT
-       } else if ((p = passwd_hash( passwd, "{CRYPT}", methods )) != NULL ) {
-               return( strcmp(p, crypt(cred, p)) );
+static int chk_crypt(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       char *cr;
+       unsigned int i;
 
-# if defined( HAVE_GETSPNAM ) \
-  || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
-       } else if ((p = passwd_hash( passwd, "{UNIX}", methods )) != NULL ) {
+       for( i=0; i<cred->bv_len; i++) {
+               if(cred->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
 
-#  ifdef HAVE_GETSPNAM
-               struct spwd *spwd = getspnam(p);
+       if( cred->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* cred must behave like a string */
+       }
+
+       if( passwd->bv_len < 2 ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must be at least two characters long */
+       }
 
-               if(spwd == NULL) {
-                       return 1;       /* not found */
+       for( i=0; i<passwd->bv_len; i++) {
+               if(passwd->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
                }
+       }
+
+       if( passwd->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must behave like a string */
+       }
+
+       cr = crypt( cred->bv_val, passwd->bv_val );
 
-               return strcmp(spwd->sp_pwdp, crypt(cred, spwd->sp_pwdp));
-#  else
-               struct passwd *pwd = getpwnam(p);
+       if( cr == NULL || cr[0] == '\0' ) {
+               /* salt must have been invalid */
+               return LUTIL_PASSWD_ERR;
+       }
+
+       return strcmp( passwd->bv_val, cr ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+}
+
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+static int chk_unix(
+       const struct berval *sc,
+       const struct berval * passwd,
+       const struct berval * cred,
+       const char **text )
+{
+       unsigned int i;
+       char *pw,*cr;
+
+       for( i=0; i<cred->bv_len; i++) {
+               if(cred->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+       if( cred->bv_val[i] != '\0' ) {
+               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 LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+
+       if( passwd->bv_val[i] != '\0' ) {
+               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 */
                }
 
-               return strcmp(pwd->pw_passwd, crypt(cred, pwd->pw_passwd));
+               pw = pwd->pw_passwd;
+       }
+#  ifdef HAVE_GETSPNAM
+       {
+               struct spwd *spwd = getspnam(passwd->bv_val);
+
+               if(spwd != NULL) {
+                       pw = spwd->sp_pwdp;
+               }
+       }
 #  endif
+#  ifdef HAVE_AIX_SECURITY
+       {
+               struct userpw *upw = getuserpw(passwd->bv_val);
+
+               if (upw != NULL) {
+                       pw = upw->upw_passwd;
+               }
+       }
+#  endif
+
+       if( pw == NULL || pw[0] == '\0' || pw[1] == '\0' ) {
+               /* password must must be at least two characters long */
+               return LUTIL_PASSWD_ERR;
+       }
+
+       cr = crypt(cred->bv_val, pw);
+
+       if( cr == NULL || cr[0] == '\0' ) {
+               /* salt must have been invalid */
+               return LUTIL_PASSWD_ERR;
+       }
+
+       return strcmp(pw, cr) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+
+}
 # endif
 #endif
+
+/* PASSWORD GENERATION ROUTINES */
+
+#ifdef LUTIL_SHA1_BYTES
+static int hash_ssha1(
+       const struct berval *scheme,
+       const struct berval  *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       lutil_SHA1_CTX  SHA1context;
+       unsigned char   SHA1digest[LUTIL_SHA1_BYTES];
+       char            saltdata[SALT_SIZE];
+       struct berval digest;
+       struct berval salt;
+
+       digest.bv_val = (char *) SHA1digest;
+       digest.bv_len = sizeof(SHA1digest);
+       salt.bv_val = saltdata;
+       salt.bv_len = sizeof(saltdata);
+
+       if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
+               return LUTIL_PASSWD_ERR; 
+       }
+
+       lutil_SHA1Init( &SHA1context );
+       lutil_SHA1Update( &SHA1context,
+               (const unsigned char *)passwd->bv_val, passwd->bv_len );
+       lutil_SHA1Update( &SHA1context,
+               (const unsigned char *)salt.bv_val, salt.bv_len );
+       lutil_SHA1Final( SHA1digest, &SHA1context );
+
+       return pw_string64( scheme, &digest, hash, &salt);
+}
+
+static int hash_sha1(
+       const struct berval *scheme,
+       const struct berval  *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       lutil_SHA1_CTX  SHA1context;
+       unsigned char   SHA1digest[LUTIL_SHA1_BYTES];
+       struct berval digest;
+       digest.bv_val = (char *) SHA1digest;
+       digest.bv_len = sizeof(SHA1digest);
+     
+       lutil_SHA1Init( &SHA1context );
+       lutil_SHA1Update( &SHA1context,
+               (const unsigned char *)passwd->bv_val, passwd->bv_len );
+       lutil_SHA1Final( SHA1digest, &SHA1context );
+            
+       return pw_string64( scheme, &digest, hash, NULL);
+}
+#endif
+
+static int hash_smd5(
+       const struct berval *scheme,
+       const struct berval  *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       lutil_MD5_CTX   MD5context;
+       unsigned char   MD5digest[LUTIL_MD5_BYTES];
+       char            saltdata[SALT_SIZE];
+       struct berval digest;
+       struct berval salt;
+
+       digest.bv_val = (char *) MD5digest;
+       digest.bv_len = sizeof(MD5digest);
+       salt.bv_val = saltdata;
+       salt.bv_len = sizeof(saltdata);
+
+       if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
+               return LUTIL_PASSWD_ERR; 
        }
 
-#ifdef SLAPD_CLEARTEXT
-       return supported_hash("{CLEARTEXT}", methods ) &&
-               strcmp(passwd, cred) != 0;
-#else
-       return( 1 );
+       lutil_MD5Init( &MD5context );
+       lutil_MD5Update( &MD5context,
+               (const unsigned char *) passwd->bv_val, passwd->bv_len );
+       lutil_MD5Update( &MD5context,
+               (const unsigned char *) salt.bv_val, salt.bv_len );
+       lutil_MD5Final( MD5digest, &MD5context );
+
+       return pw_string64( scheme, &digest, hash, &salt );
+}
+
+static int hash_md5(
+       const struct berval *scheme,
+       const struct berval  *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       lutil_MD5_CTX   MD5context;
+       unsigned char   MD5digest[LUTIL_MD5_BYTES];
+
+       struct berval digest;
+
+       digest.bv_val = (char *) MD5digest;
+       digest.bv_len = sizeof(MD5digest);
+
+       lutil_MD5Init( &MD5context );
+       lutil_MD5Update( &MD5context,
+               (const unsigned char *) passwd->bv_val, passwd->bv_len );
+       lutil_MD5Final( MD5digest, &MD5context );
+
+       return pw_string64( scheme, &digest, hash, NULL );
+;
+}
+
+#ifdef SLAPD_LMHASH 
+static int hash_lanman(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       struct berval *hash,
+       const char **text )
+{
+
+       int i;
+       char UcasePassword[15];
+       des_cblock key;
+       des_key_schedule schedule;
+       des_cblock StdText = "KGS!@#$%";
+       des_cblock PasswordHash1, PasswordHash2;
+       char PasswordHash[33];
+       
+       for( i=0; i<passwd->bv_len; i++) {
+               if(passwd->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+       
+       if( passwd->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must behave like a string */
+       }
+       
+       strncpy( UcasePassword, passwd->bv_val, 14 );
+       UcasePassword[14] = '\0';
+       ldap_pvt_str2upper( UcasePassword );
+       
+       lmPasswd_to_key( UcasePassword, &key );
+       des_set_key_unchecked( &key, schedule );
+       des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
+       
+       lmPasswd_to_key( &UcasePassword[7], &key );
+       des_set_key_unchecked( &key, schedule );
+       des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
+       
+       sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", 
+               PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
+               PasswordHash1[4],PasswordHash1[5],PasswordHash1[6],PasswordHash1[7],
+               PasswordHash2[0],PasswordHash2[1],PasswordHash2[2],PasswordHash2[3],
+               PasswordHash2[4],PasswordHash2[5],PasswordHash2[6],PasswordHash2[7] );
+       
+       hash->bv_val = PasswordHash;
+       hash->bv_len = 32;
+       
+       return pw_string( scheme, hash );
+}
+#endif /* SLAPD_LMHASH */
+
+#ifdef SLAPD_CRYPT
+static int hash_crypt(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       unsigned char salt[32]; /* salt suitable for most anything */
+       unsigned int i;
+
+       for( i=0; i<passwd->bv_len; i++) {
+               if(passwd->bv_val[i] == '\0') {
+                       return LUTIL_PASSWD_ERR;        /* NUL character in password */
+               }
+       }
+
+       if( passwd->bv_val[i] != '\0' ) {
+               return LUTIL_PASSWD_ERR;        /* passwd must behave like a string */
+       }
+
+       if( lutil_entropy( salt, sizeof( salt ) ) < 0 ) {
+               return LUTIL_PASSWD_ERR; 
+       }
+
+       for( i=0; i< ( sizeof(salt) - 1 ); i++ ) {
+               salt[i] = crypt64[ salt[i] % (sizeof(crypt64)-1) ];
+       }
+       salt[sizeof( salt ) - 1 ] = '\0';
+
+       if( salt_format != NULL ) {
+               /* copy the salt we made into entropy before snprintfing
+                  it back into the salt */
+               char entropy[sizeof(salt)];
+               strcpy( entropy, (char *) salt );
+               snprintf( (char *) salt, sizeof(entropy), salt_format, entropy );
+       }
+
+       hash->bv_val = crypt( passwd->bv_val, (char *) salt );
+
+       if( hash->bv_val == NULL ) return -1;
+
+       hash->bv_len = strlen( hash->bv_val );
+
+       if( hash->bv_len == 0 ) {
+               return LUTIL_PASSWD_ERR;
+       }
+
+       return pw_string( scheme, hash );
+}
 #endif
 
+int lutil_salt_format(const char *format)
+{
+#ifdef SLAPD_CRYPT
+       free( salt_format );
+
+       salt_format = format != NULL ? strdup( format ) : NULL;
+#endif
+
+       return 0;
+}
+
+#ifdef SLAPD_CLEARTEXT
+static int hash_clear(
+       const struct berval *scheme,
+       const struct berval  *passwd,
+       struct berval *hash,
+       const char **text )
+{
+       ber_dupbv( hash, (struct berval *)passwd );
+       return LUTIL_PASSWD_OK;
 }
+#endif
+