/* $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-2011 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 <stdio.h>
#include <ac/stdlib.h>
#include <ac/string.h>
+#include <ac/unistd.h>
+
+#if defined(SLAPD_LMHASH)
+#if defined(HAVE_OPENSSL)
+# include <openssl/des.h>
+
+
+typedef des_cblock des_key;
+typedef des_cblock des_data_block;
+typedef des_key_schedule des_context;
+#define des_failed(encrypted) 0
+#define des_finish(key, schedule)
+
+#elif defined(HAVE_MOZNSS)
+/*
+ hack hack hack
+ We need to define this here so that nspr/obsolete/protypes.h will not be included
+ if that file is included, it will create a uint32 typedef that will cause the
+ one in lutil_sha1.h to blow up
+*/
+#define PROTYPES_H 1
+# include <nss/pk11pub.h>
+typedef PK11SymKey *des_key;
+typedef unsigned char des_data_block[8];
+typedef PK11Context *des_context[1];
+#define DES_ENCRYPT CKA_ENCRYPT
-#ifdef SLAPD_KPASSWD
-# include <ac/krb.h>
-# include <ac/krb5.h>
#endif
+#endif /* SLAPD_LMHASH */
+
#include <ac/param.h>
-#include <ac/unistd.h>
-#include <ac/crypt.h>
+#ifdef SLAPD_CRYPT
+# include <ac/crypt.h>
-#ifdef HAVE_SHADOW_H
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
+# ifdef HAVE_SHADOW_H
# include <shadow.h>
-#endif
-#ifdef HAVE_PWD_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"
static const unsigned char crypt64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890./";
-struct pw_scheme;
-
-typedef int (*PASSWD_CHK_FUNC)(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
-
-typedef struct berval * (*PASSWD_HASH_FUNC) (
- const struct pw_scheme *scheme,
- const struct berval *passwd );
+#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;
- PASSWD_CHK_FUNC chk_fn;
- PASSWD_HASH_FUNC hash_fn;
+ 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 */
-static int chk_md5(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
-static int chk_smd5(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+#define SALT_SIZE 4
-static int chk_ssha1(
- const struct 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;
-static int chk_sha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
-static int chk_kerberos(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+#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 chk_crypt(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+#ifdef SLAPD_LMHASH
+static LUTIL_PASSWD_CHK_FUNC chk_lanman;
+static LUTIL_PASSWD_HASH_FUNC hash_lanman;
+#endif
-static int chk_unix(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+#ifdef SLAPD_CRYPT
+static LUTIL_PASSWD_CHK_FUNC chk_crypt;
+static LUTIL_PASSWD_HASH_FUNC hash_crypt;
+#if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
+static LUTIL_PASSWD_CHK_FUNC chk_unix;
+#endif
+#endif
/* password hash routines */
-static struct berval *hash_sha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-static struct berval *hash_ssha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-
-static struct berval *hash_smd5(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-
-static struct berval *hash_md5(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-
-static struct berval *hash_crypt(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
+#ifdef SLAPD_CLEARTEXT
+static LUTIL_PASSWD_HASH_FUNC hash_clear;
+#endif
+static struct pw_slist *pw_schemes;
+static int pw_inited;
-static const struct pw_scheme pw_schemes[] =
+static const struct pw_scheme pw_schemes_default[] =
{
- { {sizeof("{SSHA}")-1, "{SSHA}"}, chk_ssha1, hash_ssha1 },
- { {sizeof("{SHA}")-1, "{SHA}"}, chk_sha1, hash_sha1 },
+#ifdef LUTIL_SHA1_BYTES
+ { BER_BVC("{SSHA}"), chk_ssha1, hash_ssha1 },
+ { BER_BVC("{SHA}"), chk_sha1, hash_sha1 },
+#endif
- { {sizeof("{SMD5}")-1, "{SMD5}"}, chk_smd5, hash_smd5 },
- { {sizeof("{MD5}")-1, "{MD5}"}, chk_md5, hash_md5 },
+ { BER_BVC("{SMD5}"), chk_smd5, hash_smd5 },
+ { BER_BVC("{MD5}"), chk_md5, hash_md5 },
-#ifdef SLAPD_KPASSWD
- { {sizeof("{KERBEROS}")-1, "{KERBEROS}"}, chk_kerberos, NULL },
-#endif
+#ifdef SLAPD_LMHASH
+ { BER_BVC("{LANMAN}"), chk_lanman, hash_lanman },
+#endif /* SLAPD_LMHASH */
#ifdef SLAPD_CRYPT
- { {sizeof("{CRYPT}")-1, "{CRYPT}"}, chk_crypt, hash_crypt },
-#endif
-# if defined( HAVE_GETSPNAM ) \
- || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
- { {sizeof("{UNIX}")-1, "{UNIX}"}, chk_unix, NULL },
+ { BER_BVC("{CRYPT}"), chk_crypt, hash_crypt },
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
+ { BER_BVC("{UNIX}"), chk_unix, NULL },
+# endif
#endif
#ifdef SLAPD_CLEARTEXT
- /* psuedo scheme */
- { {0, "{CLEARTEXT}"}, NULL, NULL },
+ /* pseudo scheme */
+ { BER_BVC("{CLEARTEXT}"), NULL, hash_clear },
#endif
- { {0, NULL}, NULL, NULL }
+ { 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;
+
+ if (!pw_inited) lutil_passwd_init();
+
+ 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;
+
+ 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;
+ }
+}
+
+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 )
{
- int i;
+ struct pw_slist *pws;
+ struct berval bv;
+
+ if (!pw_inited) lutil_passwd_init();
- for( i=0; pw_schemes[i].name.bv_val; i++) {
- if( pw_schemes[i].name.bv_len == 0 ) continue;
+ bv.bv_val = strchr( scheme, '}' );
+ if ( !bv.bv_val )
+ return NULL;
- if( strncasecmp(scheme, pw_schemes[i].name.bv_val,
- pw_schemes[i].name.bv_len) == 0 )
- {
- return &pw_schemes[i];
+ bv.bv_len = bv.bv_val - scheme + 1;
+ bv.bv_val = (char *) scheme;
+
+ for( pws=pw_schemes; pws; pws=pws->next ) {
+ if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
+ return &(pws->s);
}
}
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 ) ) {
if( passwd->bv_len >= scheme->name.bv_len ) {
if( strncasecmp( passwd->bv_val, scheme->name.bv_val, scheme->name.bv_len ) == 0 ) {
- struct berval *bv = ber_memalloc( sizeof(struct berval) );
-
- if( bv == NULL ) return NULL;
-
bv->bv_val = &passwd->bv_val[scheme->name.bv_len];
bv->bv_len = passwd->bv_len - scheme->name.bv_len;
lutil_passwd(
const struct berval *passwd, /* stored passwd */
const struct berval *cred, /* user cred */
- const char **schemes )
+ const char **schemes,
+ const char **text )
{
- int i;
+ struct pw_slist *pws;
+
+ if ( text ) *text = NULL;
if (cred == NULL || cred->bv_len == 0 ||
passwd == NULL || passwd->bv_len == 0 )
return -1;
}
- for( i=0; pw_schemes[i].name.bv_val != NULL; i++ ) {
- if( pw_schemes[i].chk_fn ) {
- struct berval *p = passwd_scheme( &pw_schemes[i],
- passwd, schemes );
+ if (!pw_inited) lutil_passwd_init();
+
+ 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( p != NULL ) {
- int rc = (pw_schemes[i].chk_fn)( &pw_schemes[i], p, cred );
-
- /* only free the berval structure as the bv_val points
- * into passwd->bv_val
- */
- ber_memfree( p );
-
- return rc;
+ return (pws->s.chk_fn)( &(pws->s.name), p, cred, text );
}
}
}
#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
- ? 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;
}
-#else
- return 1;
#endif
-
+ return 1;
}
-struct berval * lutil_passwd_generate( ber_len_t len )
+int lutil_passwd_generate( struct berval *pw, ber_len_t len )
{
- struct berval *pw;
- if( len < 1 ) return NULL;
-
- pw = ber_memalloc( sizeof( struct berval ) );
- if( pw == NULL ) return NULL;
+ if( len < 1 ) return -1;
pw->bv_len = len;
pw->bv_val = ber_memalloc( len + 1 );
if( pw->bv_val == NULL ) {
- ber_memfree( pw );
- return NULL;
+ return -1;
}
- if( lutil_entropy( pw->bv_val, pw->bv_len) < 0 ) {
- ber_bvfree( pw );
- return NULL;
+ 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] = '\0';
- return pw;
+ return 0;
}
-struct berval * lutil_passwd_hash(
+int lutil_passwd_hash(
const struct berval * passwd,
- const char * method )
+ const char * method,
+ struct berval *hash,
+ const char **text )
{
const struct pw_scheme *sc = get_scheme( method );
- if( sc == NULL ) return NULL;
- if( ! sc->hash_fn ) return NULL;
+ hash->bv_val = NULL;
+ hash->bv_len = 0;
- return (sc->hash_fn)( sc, passwd );
+ 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 );
}
-static struct berval * pw_string(
- const struct pw_scheme *sc,
- const struct berval *passwd )
+/* 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 = ber_memalloc( sizeof( struct berval ) );
- if( pw == NULL ) return NULL;
+ struct berval pw;
- pw->bv_len = sc->name.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 ) {
- ber_memfree( pw );
- return NULL;
+ if( pw.bv_val == NULL ) {
+ return LUTIL_PASSWD_ERR;
}
- memcpy( pw->bv_val, sc->name.bv_val, sc->name.bv_len );
- 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';
+ *passwd = pw;
- pw->bv_val[pw->bv_len] = '\0';
- return pw;
+ return LUTIL_PASSWD_OK;
}
+#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
-static struct berval * pw_string64(
- const struct pw_scheme *sc,
+int lutil_passwd_string64(
+ const struct berval *sc,
const struct berval *hash,
+ struct berval *b64,
const struct berval *salt )
{
int rc;
struct berval string;
- struct berval *b64 = ber_memalloc( sizeof(struct berval) );
size_t b64len;
- if( b64 == NULL ) return NULL;
-
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 ) {
- ber_memfree( b64 );
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
- memcpy( string.bv_val, hash->bv_val,
+ AC_MEMCPY( string.bv_val, hash->bv_val,
hash->bv_len );
- memcpy( &string.bv_val[hash->bv_len], salt->bv_val,
+ AC_MEMCPY( &string.bv_val[hash->bv_len], salt->bv_val,
salt->bv_len );
string.bv_val[string.bv_len] = '\0';
}
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 ) {
if( salt ) ber_memfree( string.bv_val );
- ber_memfree( b64 );
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
- 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[b64->bv_len] = '\0';
+ (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 ) {
- ber_bvfree( b64 );
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
- return b64;
+ /* 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 pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ const struct berval * cred,
+ const char **text )
{
lutil_SHA1_CTX SHA1context;
unsigned char SHA1digest[LUTIL_SHA1_BYTES];
int rc;
unsigned char *orig_pass = NULL;
-
- /* base64 un-encode password */
+
+ /* 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 < 0) {
+ /* 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;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
static int chk_sha1(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ 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 */
+ 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 -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;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
+#endif
static int chk_smd5(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ 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 -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
- if ( rc < 0 ) {
+
+ if (rc <= (int)(sizeof(MD5digest))) {
ber_memfree(orig_pass);
- return 1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
lutil_MD5Init(&MD5context);
lutil_MD5Update(&MD5context,
- (const unsigned char *) cred->bv_val, cred->bv_len );
+ (const unsigned char *) cred->bv_val,
+ cred->bv_len );
lutil_MD5Update(&MD5context,
- (const unsigned char *) &orig_pass[sizeof(MD5digest)],
+ &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;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
static int chk_md5(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ 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 -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 */
lutil_MD5Init(&MD5context);
lutil_MD5Update(&MD5context,
- (const unsigned char *) cred->bv_val, cred->bv_len );
+ (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;
+ return rc ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
-#ifdef SLAPD_KPASSWD
-static int chk_kerberos(
- const struct pw_scheme *sc,
- const struct berval * passwd,
- const struct berval * cred )
-{
- int i;
- int rtn;
+#ifdef SLAPD_LMHASH
- for( i=0; i<cred->bv_len; i++) {
- if(cred->bv_val[i] == '\0') {
- return 1; /* NUL character in password */
- }
- }
+#if defined(HAVE_OPENSSL)
- if( cred->bv_val[i] != '\0' ) {
- return 1; /* 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 */
- }
- }
-
- if( passwd->bv_val[i] != '\0' ) {
- return 1; /* passwd must behave like a string */
- }
-
- rtn = 1;
-
-#ifdef HAVE_KRB5 /* HAVE_HEIMDAL_KRB5 */
- {
-/* Portions:
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H\xf6gskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+/*
+ * abstract away setting the parity.
*/
+static void
+des_set_key_and_parity( des_key *key, unsigned char *keyData)
+{
+ memcpy(key, keyData, 8);
+ des_set_odd_parity( key );
+}
- krb5_context context;
- krb5_error_code ret;
- krb5_creds creds;
- krb5_get_init_creds_opt get_options;
- krb5_verify_init_creds_opt verify_options;
- krb5_principal client, server;
-#ifdef notdef
- krb5_preauthtype pre_auth_types[] = {KRB5_PADATA_ENC_TIMESTAMP};
-#endif
-
- krb5_init_context( &context );
- if (ret) {
- return 1;
- }
-
-#ifdef notdef
- krb5_get_init_creds_opt_set_preauth_list(&get_options,
- pre_auth_types, 1);
-#endif
-
- krb5_get_init_creds_opt_init( &get_options );
-
- krb5_verify_init_creds_opt_init( &verify_options );
-
- ret = krb5_parse_name( context, passwd->bv_val, &client );
- if (ret) {
- krb5_free_context( context );
- return 1;
- }
+#elif defined(HAVE_MOZNSS)
- ret = krb5_get_init_creds_password( context,
- &creds, client, cred->bv_val, NULL,
- NULL, 0, NULL, &get_options );
+/*
+ * implement MozNSS wrappers for the openSSL calls
+ */
+static void
+des_set_key_and_parity( des_key *key, unsigned char *keyData)
+{
+ SECItem keyDataItem;
+ PK11SlotInfo *slot;
+ *key = NULL;
+
+ keyDataItem.data = keyData;
+ keyDataItem.len = 8;
+
+ slot = PK11_GetBestSlot(CKM_DES_ECB, NULL);
+ if (slot == NULL) {
+ return;
+ }
+
+ /* NOTE: this will not work in FIPS mode. In order to make lmhash
+ * work in fips mode we need to define a LMHASH pbe mechanism and
+ * do the fulll key derivation inside the token */
+ *key = PK11_ImportSymKey(slot, CKM_DES_ECB, PK11_OriginGenerated,
+ CKA_ENCRYPT, &keyDataItem, NULL);
+}
- if (ret) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
+static void
+des_set_key_unchecked( des_key *key, des_context ctxt )
+{
+ ctxt[0] = NULL;
- {
- char host[MAXHOSTNAMELEN];
+ /* handle error conditions from previous call */
+ if (!*key) {
+ return;
+ }
- if( gethostname( host, MAXHOSTNAMELEN ) != 0 ) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
+ ctxt[0] = PK11_CreateContextBySymKey(CKM_DES_ECB, CKA_ENCRYPT, *key, NULL);
+}
- ret = krb5_sname_to_principal( context,
- host, "ldap", KRB5_NT_SRV_HST, &server );
- }
+static void
+des_ecb_encrypt( des_data_block *plain, des_data_block *encrypted,
+ des_context ctxt, int op)
+{
+ SECStatus rv;
+ int size;
+
+ if (ctxt[0] == NULL) {
+ /* need to fail here... */
+ memset(encrypted, 0, sizeof(des_data_block));
+ return;
+ }
+ rv = PK11_CipherOp(ctxt[0], (unsigned char *)&encrypted[0],
+ &size, sizeof(des_data_block),
+ (unsigned char *)&plain[0], sizeof(des_data_block));
+ if (rv != SECSuccess) {
+ /* signal failure */
+ memset(encrypted, 0, sizeof(des_data_block));
+ return;
+ }
+ return;
+}
- if (ret) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
+static int
+des_failed(des_data_block *encrypted)
+{
+ static const des_data_block zero = { 0 };
+ return memcmp(encrypted, zero, sizeof(zero)) == 0;
+}
- ret = krb5_verify_init_creds( context,
- &creds, server, NULL, NULL, &verify_options );
+static void
+des_finish(des_key *key, des_context ctxt)
+{
+ if (*key) {
+ PK11_FreeSymKey(*key);
+ *key = NULL;
+ }
+ if (ctxt[0]) {
+ PK11_Finalize(ctxt[0]);
+ PK11_DestroyContext(ctxt[0], PR_TRUE);
+ ctxt[0] = NULL;
+ }
+}
- krb5_free_principal( context, client );
- krb5_free_principal( context, server );
- krb5_free_creds_contents( context, &creds );
- krb5_free_context( context );
+#endif
- rtn = !!ret;
- }
-#elif defined(HAVE_KRB4)
- {
- /* Borrowed from Heimdal kpopper */
-/* Portions:
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved. The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/* 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.
+ * *
+ * }
*/
- int status;
- char lrealm[REALM_SZ];
- char tkt[MaxPathLen];
-
- status = krb_get_lrealm(lrealm,1);
- if (status == KFAILURE) {
- return 1;
+static void lmPasswd_to_key(
+ const char *lmPasswd,
+ des_key *key)
+{
+ const unsigned char *lpw = (const unsigned char *) lmPasswd;
+ unsigned char k[8];
+
+ /* make room for parity bits */
+ 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_key_and_parity( key, k );
+}
+
+static int chk_lanman(
+ const struct berval *scheme,
+ const struct berval *passwd,
+ const struct berval *cred,
+ const char **text )
+{
+ ber_len_t i;
+ char UcasePassword[15];
+ des_key key;
+ des_context schedule;
+ des_data_block StdText = "KGS!@#$%";
+ des_data_block 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 );
- snprintf(tkt, sizeof(tkt), "%s_popper.%u",
- TKT_ROOT, (unsigned)getpid());
- krb_set_tkt_string (tkt);
+ if (des_failed(&PasswordHash1)) {
+ return LUTIL_PASSWD_ERR;
+ }
+
+ lmPasswd_to_key( &UcasePassword[7], &key );
+ des_set_key_unchecked( &key, schedule );
+ des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
+ if (des_failed(&PasswordHash2)) {
+ return LUTIL_PASSWD_ERR;
+ }
- status = krb_verify_user( passwd->bv_val, "", lrealm,
- cred->bv_val, KRB_VERIFY_SECURE, "pop");
+ des_finish( &key, schedule );
+
+ 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 */
- dest_tkt(); /* no point in keeping the tickets */
+#ifdef SLAPD_CRYPT
+static int lutil_crypt(
+ const char *key,
+ const char *salt,
+ char **hash )
+{
+ char *cr = crypt( key, salt );
+ int rc;
- return status == KFAILURE;
+ 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;
+ }
}
-#endif
-
- return rtn;
+ return rc;
}
-#endif /* SLAPD_KPASSWD */
-#ifdef SLAPD_CRYPT
static int chk_crypt(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ const struct berval * cred,
+ const char **text )
{
- int i;
+ 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 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 */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
- return strcmp(passwd->bv_val, crypt(cred->bv_val, passwd->bv_val));
+ return lutil_cryptptr( cred->bv_val, passwd->bv_val, NULL );
}
-# if defined( HAVE_GETSPNAM ) \
- || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
static int chk_unix(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ const struct berval * cred,
+ const char **text )
{
- int i;
+ unsigned int i;
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 */
}
-# ifdef HAVE_GETSPNAM
{
- struct spwd *spwd = getspnam(passwd->bv_val);
+ struct passwd *pwd = getpwnam(passwd->bv_val);
- if(spwd == NULL) {
- return 1; /* not found */
+ if(pwd == NULL) {
+ return LUTIL_PASSWD_ERR; /* not found */
}
- pw = spwd->sp_pwdp;
+ pw = pwd->pw_passwd;
}
-
-# else
+# ifdef HAVE_GETSPNAM
{
- struct passwd *pwd = getpwnam(passwd->bv_val);
+ struct spwd *spwd = getspnam(passwd->bv_val);
- if(pwd == NULL) {
- return 1; /* not found */
+ if(spwd != NULL) {
+ pw = spwd->sp_pwdp;
}
-
- pw = pwd->pw_passwd;
}
# endif
+# ifdef HAVE_AIX_SECURITY
+ {
+ struct userpw *upw = getuserpw(passwd->bv_val);
- if( pw == NULL || *pw == '\0' ) return 1;
+ if (upw != NULL) {
+ pw = upw->upw_passwd;
+ }
+ }
+# endif
- return strcmp(pw, crypt(cred->bv_val, pw));
+ if( pw == NULL || pw[0] == '\0' || pw[1] == '\0' ) {
+ /* password must must be at least two characters long */
+ return LUTIL_PASSWD_ERR;
+ }
+ return lutil_cryptptr( cred->bv_val, pw, NULL );
}
# endif
#endif
-/* PASSWORD CHECK ROUTINES */
-static struct berval *hash_ssha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+/* 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];
- unsigned char saltdata[4];
+ char saltdata[SALT_SIZE];
struct berval digest;
struct berval salt;
- digest.bv_val = SHA1digest;
+ digest.bv_val = (char *) SHA1digest;
digest.bv_len = sizeof(SHA1digest);
salt.bv_val = saltdata;
salt.bv_len = sizeof(saltdata);
- if( lutil_entropy( salt.bv_val, salt.bv_len) < 0 ) {
- return NULL;
+ if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
+ return LUTIL_PASSWD_ERR;
}
lutil_SHA1Init( &SHA1context );
(const unsigned char *)salt.bv_val, salt.bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
- return pw_string64( scheme, &digest, &salt);
+ return lutil_passwd_string64( scheme, &digest, hash, &salt);
}
-static struct berval *hash_sha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+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[20];
+ unsigned char SHA1digest[LUTIL_SHA1_BYTES];
struct berval digest;
- digest.bv_val = SHA1digest;
+ digest.bv_val = (char *) SHA1digest;
digest.bv_len = sizeof(SHA1digest);
lutil_SHA1Init( &SHA1context );
(const unsigned char *)passwd->bv_val, passwd->bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
- return pw_string64( scheme, &digest, NULL);
+ return lutil_passwd_string64( scheme, &digest, hash, NULL);
}
+#endif
-static struct berval *hash_smd5(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+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[16];
- unsigned char saltdata[4];
+ unsigned char MD5digest[LUTIL_MD5_BYTES];
+ char saltdata[SALT_SIZE];
struct berval digest;
struct berval salt;
- digest.bv_val = MD5digest;
+ digest.bv_val = (char *) MD5digest;
digest.bv_len = sizeof(MD5digest);
salt.bv_val = saltdata;
salt.bv_len = sizeof(saltdata);
- if( lutil_entropy( salt.bv_val, salt.bv_len) < 0 ) {
- return NULL;
+ if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
+ return LUTIL_PASSWD_ERR;
}
lutil_MD5Init( &MD5context );
(const unsigned char *) salt.bv_val, salt.bv_len );
lutil_MD5Final( MD5digest, &MD5context );
- return pw_string64( scheme, &digest, &salt );
+ return lutil_passwd_string64( scheme, &digest, hash, &salt );
}
-static struct berval *hash_md5(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+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[16];
+ unsigned char MD5digest[LUTIL_MD5_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
+ digest.bv_val = (char *) MD5digest;
digest.bv_len = sizeof(MD5digest);
lutil_MD5Init( &MD5context );
(const unsigned char *) passwd->bv_val, passwd->bv_len );
lutil_MD5Final( MD5digest, &MD5context );
- return pw_string64( scheme, &digest, NULL );
+ return lutil_passwd_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 )
+{
+
+ ber_len_t i;
+ char UcasePassword[15];
+ des_key key;
+ des_context schedule;
+ des_data_block StdText = "KGS!@#$%";
+ des_data_block 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 struct berval *hash_crypt(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+static int hash_crypt(
+ const struct berval *scheme,
+ const struct berval *passwd,
+ struct berval *hash,
+ const char **text )
{
- struct berval hash;
- unsigned char salt[3];
- int i;
+ 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 LUTIL_PASSWD_ERR;
}
- if( lutil_entropy( salt, sizeof(salt)) < 0 ) {
- return NULL;
+ 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 );
+ }
+
+ rc = lutil_cryptptr( passwd->bv_val, (char *) salt, &hash->bv_val );
+ if ( rc != LUTIL_PASSWD_OK ) return rc;
- salt[0] = crypt64[ salt[0] % (sizeof(crypt64)-1) ];
- salt[1] = crypt64[ salt[1] % (sizeof(crypt64)-1) ];
- salt[2] = '\0';
+ if( hash->bv_val == NULL ) return -1;
- hash.bv_val = crypt( passwd->bv_val, salt );
+ hash->bv_len = strlen( hash->bv_val );
- if( hash.bv_val == NULL ) return NULL;
- hash.bv_len = strlen( hash.bv_val );
+ save = hash->bv_val;
- return pw_string( scheme, &hash );
+ if( hash->bv_len == 0 ) {
+ rc = LUTIL_PASSWD_ERR;
+ } else {
+ rc = pw_string( scheme, hash );
+ }
+ ber_memfree( save );
+ return rc;
}
#endif
+
+int lutil_salt_format(const char *format)
+{
+#ifdef SLAPD_CRYPT
+ ber_memfree( salt_format );
+
+ salt_format = format != NULL ? ber_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
+