X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Fpasswd.c;h=f16b49a2bc3f9d79f9b8717f175e3b8646458728;hb=f3648ea812ea7327e88217cdeb8def360aa012ad;hp=99b09c37b99b09f14c6ee31dc8ce3349fb01d386;hpb=4c69827b15676f03ee87cc81c0826a32a07131b2;p=openldap
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 99b09c37b9..f16b49a2bc 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -1,8 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
*/
+
/*
* int lutil_passwd(
* const struct berval *passwd,
@@ -31,16 +41,7 @@
# endif
#endif
-#ifdef SLAPD_KPASSWD
-# include
-# include
-#endif
-
-/* KPASSWD/krb.h brings in a conflicting des.h so don't use both.
- * configure currently requires OpenSSL to enable LMHASH. Obviously
- * this requirement can be fulfilled by the KRB DES library as well.
- */
-#if defined(SLAPD_LMHASH) && !defined(DES_ENCRYPT)
+#if defined(SLAPD_LMHASH)
# include
#endif /* SLAPD_LMHASH */
@@ -65,6 +66,7 @@
#include
#include "ldap_pvt.h"
+#include "lber_pvt.h"
#include "lutil_md5.h"
#include "lutil_sha1.h"
@@ -77,166 +79,139 @@ static const unsigned char crypt64[] =
static char *salt_format = NULL;
#endif
-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 );
-
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
-#ifdef LUTIL_SHA1_BYTES
-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 );
+
+#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
#ifdef SLAPD_LMHASH
-static int chk_lanman(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+static LUTIL_PASSWD_CHK_FUNC chk_lanman;
+static LUTIL_PASSWD_HASH_FUNC hash_lanman;
#endif
#ifdef SLAPD_SPASSWD
-static int chk_sasl(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
-#endif
-
-#ifdef SLAPD_KPASSWD
-static int chk_kerberos(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+static LUTIL_PASSWD_CHK_FUNC chk_sasl;
#endif
#ifdef SLAPD_CRYPT
-static int chk_crypt(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+static LUTIL_PASSWD_CHK_FUNC chk_crypt;
+static LUTIL_PASSWD_HASH_FUNC hash_crypt;
#if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
-static int chk_unix(
- const struct pw_scheme *scheme,
- const struct berval *passwd,
- const struct berval *cred );
+static LUTIL_PASSWD_CHK_FUNC chk_unix;
#endif
#endif
-
-#ifdef LUTIL_SHA1_BYTES
/* password hash routines */
-static struct berval *hash_sha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-
-static struct berval *hash_ssha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-#endif
-
-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 );
-
-#ifdef SLAPD_LMHASH
-static struct berval *hash_lanman(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-#endif
-
-#ifdef SLAPD_CRYPT
-static struct berval *hash_crypt(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
-#endif
#ifdef SLAPD_CLEARTEXT
-static struct berval *hash_clear(
- const struct pw_scheme *scheme,
- const struct berval *passwd );
+static LUTIL_PASSWD_HASH_FUNC hash_clear;
#endif
-static const struct pw_scheme pw_schemes[] =
+static struct pw_slist *pw_schemes;
+
+static const struct pw_scheme pw_schemes_default[] =
{
#ifdef LUTIL_SHA1_BYTES
- { {sizeof("{SSHA}")-1, "{SSHA}"}, chk_ssha1, hash_ssha1 },
- { {sizeof("{SHA}")-1, "{SHA}"}, chk_sha1, hash_sha1 },
+ { 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_LMHASH
- { {sizeof("{LANMAN}")-1, "{LANMAN}"}, chk_lanman, hash_lanman },
+ { BER_BVC("{LANMAN}"), chk_lanman, hash_lanman },
#endif /* SLAPD_LMHASH */
#ifdef SLAPD_SPASSWD
- { {sizeof("{SASL}")-1, "{SASL}"}, chk_sasl, NULL },
-#endif
-
-#ifdef SLAPD_KPASSWD
- { {sizeof("{KERBEROS}")-1, "{KERBEROS}"}, chk_kerberos, NULL },
+ { BER_BVC("{SASL}"), chk_sasl, NULL },
#endif
#ifdef SLAPD_CRYPT
- { {sizeof("{CRYPT}")-1, "{CRYPT}"}, chk_crypt, hash_crypt },
+ { BER_BVC("{CRYPT}"), chk_crypt, hash_crypt },
# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
- { {sizeof("{UNIX}")-1, "{UNIX}"}, chk_unix, NULL },
+ { BER_BVC("{UNIX}"), chk_unix, NULL },
# endif
#endif
#ifdef SLAPD_CLEARTEXT
- /* psuedo scheme */
- { {0, "{CLEARTEXT}"}, NULL, hash_clear },
+ /* pseudo scheme */
+ { {0, "{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;
+
+ 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;
+
+ 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;
- for( i=0; pw_schemes[i].name.bv_val; i++) {
- if( pw_schemes[i].name.bv_val == NULL ) continue;
+ if (!pw_schemes) lutil_passwd_init();
- if( strcasecmp(scheme, pw_schemes[i].name.bv_val ) == 0 ) {
- return &pw_schemes[i];
+ for( pws=pw_schemes; pws; pws=pws->next ) {
+ if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) {
+ return &(pws->s);
}
}
@@ -299,9 +274,12 @@ int
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 )
@@ -309,14 +287,16 @@ lutil_passwd(
return -1;
}
- for( i=0; pw_schemes[i].name.bv_val != NULL; i++ ) {
- if( pw_schemes[i].chk_fn ) {
+ if (!pw_schemes) lutil_passwd_init();
+
+ for( pws=pw_schemes; pws; pws=pws->next ) {
+ if( pws->s.chk_fn ) {
struct berval x;
- struct berval *p = passwd_scheme( &pw_schemes[i],
+ struct berval *p = passwd_scheme( &(pws->s),
passwd, &x, schemes );
if( p != NULL ) {
- return (pw_schemes[i].chk_fn)( &pw_schemes[i], p, cred );
+ return (pws->s.chk_fn)( &(pws->s.name), p, cred, text );
}
}
}
@@ -332,26 +312,20 @@ lutil_passwd(
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++ ) {
@@ -361,66 +335,77 @@ struct berval * lutil_passwd_generate( ber_len_t 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;
+
+ if( sc == NULL ) {
+ if( text ) *text = "scheme not recognized";
+ return -1;
+ }
- return (sc->hash_fn)( sc, passwd );
+ 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 struct berval * pw_string(
- const struct pw_scheme *sc,
- const struct berval *passwd )
+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;
}
- AC_MEMCPY( pw->bv_val, sc->name.bv_val, sc->name.bv_len );
- AC_MEMCPY( &pw->bv_val[sc->name.bv_len], passwd->bv_val, passwd->bv_len );
+ AC_MEMCPY( pw.bv_val, sc->bv_val, sc->bv_len );
+ AC_MEMCPY( &pw.bv_val[sc->bv_len], passwd->bv_val, passwd->bv_len );
- pw->bv_val[pw->bv_len] = '\0';
- return pw;
+ pw.bv_val[pw.bv_len] = '\0';
+ *passwd = pw;
+
+ return LUTIL_PASSWD_OK;
}
#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
-static struct berval * pw_string64(
- const struct pw_scheme *sc,
+static int pw_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;
}
AC_MEMCPY( string.bv_val, hash->bv_val,
@@ -434,58 +419,63 @@ static struct berval * pw_string64(
}
b64len = LUTIL_BASE64_ENCODE_LEN( string.bv_len ) + 1;
- b64->bv_len = b64len + sc->name.bv_len;
+ b64->bv_len = b64len + sc->bv_len;
b64->bv_val = ber_memalloc( b64->bv_len + 1 );
if( b64->bv_val == NULL ) {
if( salt ) ber_memfree( string.bv_val );
- ber_memfree( b64 );
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
- AC_MEMCPY(b64->bv_val, sc->name.bv_val, sc->name.bv_len);
+ AC_MEMCPY(b64->bv_val, sc->bv_val, sc->bv_len);
rc = lutil_b64_ntop(
- string.bv_val, string.bv_len,
- &b64->bv_val[sc->name.bv_len], b64len );
+ (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;
}
/* recompute length */
- b64->bv_len = sc->name.bv_len + rc;
+ b64->bv_len = sc->bv_len + rc;
assert( strlen(b64->bv_val) == b64->bv_len );
- return b64;
+ 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;
-
+
+ /* 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 */
@@ -500,30 +490,36 @@ static int chk_ssha1(
/* 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(
- 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 */
@@ -535,30 +531,37 @@ static int chk_sha1(
/* 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
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 */
@@ -574,29 +577,35 @@ static int chk_smd5(
/* 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(
- 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 */
@@ -609,19 +618,133 @@ static int chk_md5(
/* 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
+/* 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 pw_scheme *scheme,
+ const struct berval *scheme,
const struct berval *passwd,
- const struct berval *cred )
+ const struct berval *cred,
+ const char **text )
{
- struct berval *hash;
-
- hash = hash_lanman( scheme, cred );
- return memcmp( &hash->bv_val[scheme->name.bv_len], passwd->bv_val, 32);
+ 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; ibv_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 */
@@ -631,50 +754,50 @@ sasl_conn_t *lutil_passwd_sasl_conn = NULL;
#endif
static int chk_sasl(
- const struct pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ const struct berval * cred,
+ const char **text )
{
unsigned int i;
int rtn;
for( i=0; ibv_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; ibv_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 */
}
- rtn = 1;
+ rtn = LUTIL_PASSWD_ERR;
#ifdef HAVE_CYRUS_SASL
if( lutil_passwd_sasl_conn != NULL ) {
int sc;
# if SASL_VERSION_MAJOR < 2
- const char *errstr = NULL;
sc = sasl_checkpass( lutil_passwd_sasl_conn,
passwd->bv_val, passwd->bv_len,
cred->bv_val, cred->bv_len,
- &errstr );
+ 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 );
+ rtn = ( sc != SASL_OK ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
#endif
@@ -682,255 +805,84 @@ static int chk_sasl(
}
#endif
-#ifdef SLAPD_KPASSWD
-static int chk_kerberos(
- const struct pw_scheme *sc,
- const struct berval * passwd,
- const struct berval * cred )
-{
- unsigned int i;
- int rtn;
-
- for( i=0; ibv_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 */
- }
-
- for( i=0; ibv_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.
- */
-
- 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
-
- ret = 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;
- }
-
- ret = krb5_get_init_creds_password( context,
- &creds, client, cred->bv_val, NULL,
- NULL, 0, NULL, &get_options );
-
- if (ret) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
-
- {
- char *host = ldap_pvt_get_fqdn( NULL );
-
- if( host == NULL ) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
-
- ret = krb5_sname_to_principal( context,
- host, "ldap", KRB5_NT_SRV_HST, &server );
-
- ber_memfree( host );
- }
-
- if (ret) {
- krb5_free_principal( context, client );
- krb5_free_context( context );
- return 1;
- }
-
- ret = krb5_verify_init_creds( context,
- &creds, server, NULL, NULL, &verify_options );
-
- krb5_free_principal( context, client );
- krb5_free_principal( context, server );
- krb5_free_cred_contents( context, &creds );
- krb5_free_context( context );
-
- 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.
- */
-
- int status;
- char lrealm[REALM_SZ];
- char tkt[MAXHOSTNAMELEN];
-
- status = krb_get_lrealm(lrealm,1);
- if (status == KFAILURE) {
- return 1;
- }
-
- snprintf(tkt, sizeof(tkt), "%s_slapd.%u",
- TKT_ROOT, (unsigned)getpid());
- krb_set_tkt_string (tkt);
-
- status = krb_verify_user( passwd->bv_val, "", lrealm,
- cred->bv_val, 1, "ldap");
-
- dest_tkt(); /* no point in keeping the tickets */
-
- return status == KFAILURE;
- }
-#endif
-
- return rtn;
-}
-#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 )
{
char *cr;
unsigned int i;
for( i=0; ibv_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; ibv_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 */
}
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;
}
- return strcmp( passwd->bv_val, cr ) ? 1 : 0;
+ 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 pw_scheme *sc,
+ const struct berval *sc,
const struct berval * passwd,
- const struct berval * cred )
+ const struct berval * cred,
+ const char **text )
{
unsigned int i;
char *pw,*cr;
for( i=0; ibv_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; ibv_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;
@@ -956,17 +908,17 @@ static int chk_unix(
if( pw == NULL || pw[0] == '\0' || pw[1] == '\0' ) {
/* password must must be at least two characters long */
- return -1;
+ return LUTIL_PASSWD_ERR;
}
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 strcmp(pw, cr) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
# endif
@@ -975,23 +927,25 @@ static int chk_unix(
/* PASSWORD GENERATION ROUTINES */
#ifdef LUTIL_SHA1_BYTES
-static struct berval *hash_ssha1(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+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 );
@@ -1001,17 +955,19 @@ static struct berval *hash_ssha1(
(const unsigned char *)salt.bv_val, salt.bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
- return pw_string64( scheme, &digest, &salt);
+ return pw_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[LUTIL_SHA1_BYTES];
struct berval digest;
- digest.bv_val = SHA1digest;
+ digest.bv_val = (char *) SHA1digest;
digest.bv_len = sizeof(SHA1digest);
lutil_SHA1Init( &SHA1context );
@@ -1019,27 +975,29 @@ static struct berval *hash_sha1(
(const unsigned char *)passwd->bv_val, passwd->bv_len );
lutil_SHA1Final( SHA1digest, &SHA1context );
- return pw_string64( scheme, &digest, NULL);
+ return pw_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[LUTIL_MD5_BYTES];
- unsigned char saltdata[4];
+ 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 );
@@ -1049,19 +1007,21 @@ static struct berval *hash_smd5(
(const unsigned char *) salt.bv_val, salt.bv_len );
lutil_MD5Final( MD5digest, &MD5context );
- return pw_string64( scheme, &digest, &salt );
+ return pw_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[LUTIL_MD5_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
+ digest.bv_val = (char *) MD5digest;
digest.bv_len = sizeof(MD5digest);
lutil_MD5Init( &MD5context );
@@ -1069,89 +1029,16 @@ static struct berval *hash_md5(
(const unsigned char *) passwd->bv_val, passwd->bv_len );
lutil_MD5Final( MD5digest, &MD5context );
- return pw_string64( scheme, &digest, NULL );
+ return pw_string64( scheme, &digest, hash, NULL );
;
}
#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 struct berval *hash_lanman(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+static int hash_lanman(
+ const struct berval *scheme,
+ const struct berval *passwd,
+ struct berval *hash,
+ const char **text )
{
int i;
@@ -1159,18 +1046,17 @@ static struct berval *hash_lanman(
des_cblock key;
des_key_schedule schedule;
des_cblock StdText = "KGS!@#$%";
- des_cblock hash1, hash2;
- char lmhash[33];
- struct berval hash;
+ des_cblock PasswordHash1, PasswordHash2;
+ char PasswordHash[33];
for( i=0; ibv_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 */
}
strncpy( UcasePassword, passwd->bv_val, 14 );
@@ -1179,44 +1065,47 @@ static struct berval *hash_lanman(
lmPasswd_to_key( UcasePassword, &key );
des_set_key_unchecked( &key, schedule );
- des_ecb_encrypt( &StdText, &hash1, schedule , DES_ENCRYPT );
+ des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
lmPasswd_to_key( &UcasePassword[7], &key );
des_set_key_unchecked( &key, schedule );
- des_ecb_encrypt( &StdText, &hash2, schedule , DES_ENCRYPT );
+ des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
- sprintf( lmhash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- hash1[0],hash1[1],hash1[2],hash1[3],hash1[4],hash1[5],hash1[6],hash1[7],
- hash2[0],hash2[1],hash2[2],hash2[3],hash2[4],hash2[5],hash2[6],hash2[7] );
+ 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 = lmhash;
- hash.bv_len = 32;
+ hash->bv_val = PasswordHash;
+ hash->bv_len = 32;
- return pw_string( scheme, &hash );
+ 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[32]; /* salt suitable for most anything */
unsigned int i;
for( i=0; ibv_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++ ) {
@@ -1228,21 +1117,21 @@ static struct berval *hash_crypt(
/* copy the salt we made into entropy before snprintfing
it back into the salt */
char entropy[sizeof(salt)];
- strcpy( entropy, salt );
- snprintf( salt, sizeof(entropy), salt_format, entropy );
+ strcpy( entropy, (char *) salt );
+ snprintf( (char *) salt, sizeof(entropy), salt_format, entropy );
}
- hash.bv_val = crypt( passwd->bv_val, salt );
+ hash->bv_val = crypt( passwd->bv_val, (char *) salt );
- if( hash.bv_val == NULL ) return NULL;
+ if( hash->bv_val == NULL ) return -1;
- hash.bv_len = strlen( hash.bv_val );
+ hash->bv_len = strlen( hash->bv_val );
- if( hash.bv_len == 0 ) {
- return NULL;
+ if( hash->bv_len == 0 ) {
+ return LUTIL_PASSWD_ERR;
}
- return pw_string( scheme, &hash );
+ return pw_string( scheme, hash );
}
#endif
@@ -1258,12 +1147,14 @@ int lutil_salt_format(const char *format)
}
#ifdef SLAPD_CLEARTEXT
-static struct berval *hash_clear(
- const struct pw_scheme *scheme,
- const struct berval *passwd )
+static int hash_clear(
+ const struct berval *scheme,
+ const struct berval *passwd,
+ struct berval *hash,
+ const char **text )
{
- return ber_bvdup( (struct berval *) passwd );
+ ber_dupbv( hash, (struct berval *)passwd );
+ return LUTIL_PASSWD_OK;
}
#endif
-