X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Fliblutil%2Fpasswd.c;h=d5ab32617261f06e9f4a11ab9df444d3aae4b4f0;hb=8452b4ccde09a41c7e21cff66ec4f566b1a34e28;hp=8e727a4111bc91c2e85caf255cedbe7273e27c41;hpb=9c6428b29e4c963df0f2597d7917a5bdc35dcb04;p=openldap
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 8e727a4111..d5ab326172 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,16 +33,33 @@
#include
#include
-#ifdef SLAPD_SPASSWD
-# ifdef HAVE_SASL_SASL_H
-# include
-# else
-# include
-# endif
-#endif
-
#if defined(SLAPD_LMHASH)
+#if defined(HAVE_OPENSSL)
# include
+
+
+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
+typedef PK11SymKey *des_key;
+typedef unsigned char des_data_block[8];
+typedef PK11Context *des_context[1];
+#define DES_ENCRYPT CKA_ENCRYPT
+
+#endif
+
#endif /* SLAPD_LMHASH */
#include
@@ -50,7 +67,7 @@
#ifdef SLAPD_CRYPT
# include
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
# ifdef HAVE_SHADOW_H
# include
# endif
@@ -77,8 +94,14 @@ static const unsigned char crypt64[] =
#ifdef SLAPD_CRYPT
static char *salt_format = NULL;
+static lutil_cryptfunc lutil_crypt;
+lutil_cryptfunc *lutil_cryptptr = lutil_crypt;
#endif
+/* KLUDGE:
+ * chk_fn is NULL iff name is {CLEARTEXT}
+ * otherwise, things will break
+ */
struct pw_scheme {
struct berval name;
LUTIL_PASSWD_CHK_FUNC *chk_fn;
@@ -112,15 +135,11 @@ 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 )
+#if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
static LUTIL_PASSWD_CHK_FUNC chk_unix;
#endif
#endif
@@ -132,6 +151,7 @@ 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_default[] =
{
@@ -147,20 +167,16 @@ static const struct pw_scheme pw_schemes_default[] =
{ BER_BVC("{LANMAN}"), chk_lanman, hash_lanman },
#endif /* SLAPD_LMHASH */
-#ifdef SLAPD_SPASSWD
- { BER_BVC("{SASL}"), chk_sasl, NULL },
-#endif
-
#ifdef SLAPD_CRYPT
{ BER_BVC("{CRYPT}"), chk_crypt, hash_crypt },
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
{ BER_BVC("{UNIX}"), chk_unix, NULL },
# endif
#endif
#ifdef SLAPD_CLEARTEXT
/* pseudo scheme */
- { {0, "{CLEARTEXT}"}, NULL, hash_clear },
+ { BER_BVC("{CLEARTEXT}"), NULL, hash_clear },
#endif
{ BER_BVNULL, NULL, NULL }
@@ -173,6 +189,8 @@ int lutil_passwd_add(
{
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;
@@ -185,11 +203,12 @@ int lutil_passwd_add(
void lutil_passwd_init()
{
- struct pw_slist *ptr;
struct pw_scheme *s;
+ pw_inited = 1;
+
for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
- if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn )) break;
+ if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn ) ) break;
}
}
@@ -207,11 +226,19 @@ static const struct pw_scheme *get_scheme(
const char* scheme )
{
struct pw_slist *pws;
+ struct berval bv;
- if (!pw_schemes) lutil_passwd_init();
+ if (!pw_inited) lutil_passwd_init();
+
+ bv.bv_val = strchr( scheme, '}' );
+ if ( !bv.bv_val )
+ return NULL;
+
+ bv.bv_len = bv.bv_val - scheme + 1;
+ bv.bv_val = (char *) scheme;
for( pws=pw_schemes; pws; pws=pws->next ) {
- if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) {
+ if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
return &(pws->s);
}
}
@@ -288,7 +315,7 @@ lutil_passwd(
return -1;
}
- if (!pw_schemes) lutil_passwd_init();
+ if (!pw_inited) lutil_passwd_init();
for( pws=pw_schemes; pws; pws=pws->next ) {
if( pws->s.chk_fn ) {
@@ -303,36 +330,37 @@ lutil_passwd(
}
#ifdef SLAPD_CLEARTEXT
+ /* Do we think there is a scheme specifier here that we
+ * didn't recognize? Assume a scheme name is at least 1 character.
+ */
+ if (( passwd->bv_val[0] == '{' ) &&
+ ( ber_bvchr( passwd, '}' ) > passwd->bv_val+1 ))
+ {
+ return 1;
+ }
if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
- return (( passwd->bv_len == cred->bv_len ) &&
- ( passwd->bv_val[0] != '{' /*'}'*/ ))
- ? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
+ return ( passwd->bv_len == cred->bv_len ) ?
+ memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
: 1;
}
#endif
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( (unsigned char *) pw->bv_val, pw->bv_len) < 0 ) {
- ber_bvfree( pw );
- return NULL;
+ return -1;
}
for( len = 0; len < pw->bv_len; len++ ) {
@@ -342,76 +370,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,
+ 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 NULL;
+ return -1;
}
if( ! sc->hash_fn ) {
if( text ) *text = "scheme provided no hash function";
- return NULL;
+ return -1;
}
if( text ) *text = NULL;
- return (sc->hash_fn)( &sc->name, passwd, text );
+ 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(
+static int pw_string(
const struct berval *sc,
- const struct berval *passwd )
+ struct berval *passwd )
{
- struct berval *pw = ber_memalloc( sizeof( struct berval ) );
- if( pw == NULL ) return NULL;
+ struct berval pw;
- pw->bv_len = sc->bv_len + passwd->bv_len;
- pw->bv_val = ber_memalloc( pw->bv_len + 1 );
+ pw.bv_len = sc->bv_len + passwd->bv_len;
+ pw.bv_val = ber_memalloc( pw.bv_len + 1 );
- if( pw->bv_val == NULL ) {
- ber_memfree( pw );
- return NULL;
+ 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 );
+ 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(
+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;
}
AC_MEMCPY( string.bv_val, hash->bv_val,
@@ -430,8 +459,7 @@ static struct berval * pw_string64(
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->bv_val, sc->bv_len);
@@ -443,14 +471,13 @@ static struct berval * pw_string64(
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->bv_len + rc;
assert( strlen(b64->bv_val) == b64->bv_len );
- return b64;
+ return LUTIL_PASSWD_OK;
}
/* PASSWORD CHECK ROUTINES */
@@ -467,23 +494,23 @@ static int chk_ssha1(
int rc;
unsigned char *orig_pass = NULL;
- /* safety check */
- if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <
- sizeof(SHA1digest)+SALT_SIZE) {
- return -1;
+ /* safety check -- must have some salt */
+ if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <= sizeof(SHA1digest)) {
+ return LUTIL_PASSWD_ERR;
}
/* decode base64 password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
- if (rc < (int)(sizeof(SHA1digest)+SALT_SIZE)) {
+ /* safety check -- must have some salt */
+ if (rc <= (int)(sizeof(SHA1digest))) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
@@ -498,7 +525,7 @@ 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(
@@ -514,20 +541,20 @@ static int chk_sha1(
/* safety check */
if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) < sizeof(SHA1digest)) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
if( rc != sizeof(SHA1digest) ) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
@@ -539,7 +566,7 @@ 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
@@ -555,22 +582,21 @@ static int chk_smd5(
unsigned char *orig_pass = NULL;
/* safety check */
- if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <
- sizeof(MD5digest)+SALT_SIZE) {
- return -1;
+ if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) <= sizeof(MD5digest)) {
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
- if (rc < (int)(sizeof(MD5digest)+SALT_SIZE)) {
+ if (rc <= (int)(sizeof(MD5digest))) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
@@ -586,7 +612,7 @@ 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(
@@ -602,19 +628,19 @@ static int chk_md5(
/* safety check */
if (LUTIL_BASE64_DECODE_LEN(passwd->bv_len) < sizeof(MD5digest)) {
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* base64 un-encode password */
orig_pass = (unsigned char *) ber_memalloc( (size_t) (
LUTIL_BASE64_DECODE_LEN(passwd->bv_len) + 1) );
- if( orig_pass == NULL ) return -1;
+ if( orig_pass == NULL ) return LUTIL_PASSWD_ERR;
rc = lutil_b64_pton(passwd->bv_val, orig_pass, passwd->bv_len);
if ( rc != sizeof(MD5digest) ) {
ber_memfree(orig_pass);
- return -1;
+ return LUTIL_PASSWD_ERR;
}
/* hash credentials with salt */
@@ -627,10 +653,110 @@ 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
+
+#if defined(HAVE_OPENSSL)
+
+/*
+ * 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 );
+}
+
+
+#elif defined(HAVE_MOZNSS)
+
+/*
+ * 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);
+}
+
+static void
+des_set_key_unchecked( des_key *key, des_context ctxt )
+{
+ ctxt[0] = NULL;
+
+ /* handle error conditions from previous call */
+ if (!*key) {
+ return;
+ }
+
+ ctxt[0] = PK11_CreateContextBySymKey(CKM_DES_ECB, CKA_ENCRYPT, *key, NULL);
+}
+
+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;
+}
+
+static int
+des_failed(des_data_block *encrypted)
+{
+ static const des_data_block zero = { 0 };
+ return memcmp(encrypted, zero, sizeof(zero)) == 0;
+}
+
+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;
+ }
+}
+
+#endif
+
/* pseudocode from RFC2433
* A.2 LmPasswordHash()
*
@@ -690,20 +816,23 @@ static int chk_md5(
*/
static void lmPasswd_to_key(
- const unsigned char *lmPasswd,
- des_cblock *key)
+ const char *lmPasswd,
+ des_key *key)
{
+ const unsigned char *lpw = (const unsigned char *) lmPasswd;
+ unsigned char k[8];
+
/* make room for parity bits */
- ((char *)key)[0] = lmPasswd[0];
- ((char *)key)[1] = ((lmPasswd[0]&0x01)<<7) | (lmPasswd[1]>>1);
- ((char *)key)[2] = ((lmPasswd[1]&0x03)<<6) | (lmPasswd[2]>>2);
- ((char *)key)[3] = ((lmPasswd[2]&0x07)<<5) | (lmPasswd[3]>>3);
- ((char *)key)[4] = ((lmPasswd[3]&0x0F)<<4) | (lmPasswd[4]>>4);
- ((char *)key)[5] = ((lmPasswd[4]&0x1F)<<3) | (lmPasswd[5]>>5);
- ((char *)key)[6] = ((lmPasswd[5]&0x3F)<<2) | (lmPasswd[6]>>6);
- ((char *)key)[7] = ((lmPasswd[6]&0x7F)<<1);
+ k[0] = lpw[0];
+ k[1] = ((lpw[0] & 0x01) << 7) | (lpw[1] >> 1);
+ k[2] = ((lpw[1] & 0x03) << 6) | (lpw[2] >> 2);
+ k[3] = ((lpw[2] & 0x07) << 5) | (lpw[3] >> 3);
+ k[4] = ((lpw[3] & 0x0F) << 4) | (lpw[4] >> 4);
+ k[5] = ((lpw[4] & 0x1F) << 3) | (lpw[5] >> 5);
+ k[6] = ((lpw[5] & 0x3F) << 2) | (lpw[6] >> 6);
+ k[7] = ((lpw[6] & 0x7F) << 1);
- des_set_odd_parity( key );
+ des_set_key_and_parity( key, k );
}
static int chk_lanman(
@@ -712,22 +841,22 @@ static int chk_lanman(
const struct berval *cred,
const char **text )
{
- int i;
+ ber_len_t i;
char UcasePassword[15];
- des_cblock key;
- des_key_schedule schedule;
- des_cblock StdText = "KGS!@#$%";
- des_cblock PasswordHash1, PasswordHash2;
+ des_key key;
+ des_context schedule;
+ des_data_block StdText = "KGS!@#$%";
+ des_data_block PasswordHash1, PasswordHash2;
char PasswordHash[33], storedPasswordHash[33];
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; /* passwd must behave like a string */
+ return LUTIL_PASSWD_ERR; /* passwd must behave like a string */
}
strncpy( UcasePassword, cred->bv_val, 14 );
@@ -737,10 +866,19 @@ static int chk_lanman(
lmPasswd_to_key( UcasePassword, &key );
des_set_key_unchecked( &key, schedule );
des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
+
+ 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;
+ }
+
+ 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],
@@ -753,112 +891,69 @@ static int chk_lanman(
storedPasswordHash[32] = '\0';
ldap_pvt_str2lower( storedPasswordHash );
- return memcmp( PasswordHash, storedPasswordHash, 32) ? 1 : 0;
+ return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
#endif /* SLAPD_LMHASH */
-#ifdef SLAPD_SPASSWD
-#ifdef HAVE_CYRUS_SASL
-sasl_conn_t *lutil_passwd_sasl_conn = NULL;
-#endif
-
-static int chk_sasl(
- const struct berval *sc,
- const struct berval * passwd,
- const struct berval * cred,
- const char **text )
+#ifdef SLAPD_CRYPT
+static int lutil_crypt(
+ const char *key,
+ const char *salt,
+ char **hash )
{
- unsigned int i;
- int rtn;
-
- for( i=0; 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 */
- }
+ char *cr = crypt( key, salt );
+ int rc;
- for( i=0; ibv_len; i++) {
- if(passwd->bv_val[i] == '\0') {
- return 1; /* NUL character in password */
+ if( cr == NULL || cr[0] == '\0' ) {
+ /* salt must have been invalid */
+ rc = LUTIL_PASSWD_ERR;
+ } else {
+ if ( hash ) {
+ *hash = ber_strdup( cr );
+ rc = LUTIL_PASSWD_OK;
+ } else {
+ rc = strcmp( salt, cr ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
}
}
-
- if( passwd->bv_val[i] != '\0' ) {
- return 1; /* passwd must behave like a string */
- }
-
- rtn = 1;
-
-#ifdef HAVE_CYRUS_SASL
- if( lutil_passwd_sasl_conn != NULL ) {
- int sc;
-# if SASL_VERSION_MAJOR < 2
- sc = sasl_checkpass( lutil_passwd_sasl_conn,
- passwd->bv_val, passwd->bv_len,
- cred->bv_val, cred->bv_len,
- text );
-# else
- sc = sasl_checkpass( lutil_passwd_sasl_conn,
- passwd->bv_val, passwd->bv_len,
- cred->bv_val, cred->bv_len );
-# endif
- rtn = ( sc != SASL_OK );
- }
-#endif
-
- return rtn;
+ return rc;
}
-#endif
-#ifdef SLAPD_CRYPT
static int chk_crypt(
const struct berval *sc,
const struct berval * passwd,
const struct berval * cred,
const char **text )
{
- char *cr;
unsigned int i;
for( i=0; 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 strcmp( passwd->bv_val, cr ) ? 1 : 0;
+ return lutil_cryptptr( cred->bv_val, passwd->bv_val, NULL );
}
-# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_STRUCT_PASSWD_PW_PASSWD )
static int chk_unix(
const struct berval *sc,
const struct berval * passwd,
@@ -866,32 +961,32 @@ static int chk_unix(
const char **text )
{
unsigned int i;
- char *pw,*cr;
+ char *pw;
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;
@@ -917,18 +1012,10 @@ static int chk_unix(
if( pw == NULL || pw[0] == '\0' || pw[1] == '\0' ) {
/* password must must be at least two characters long */
- return -1;
- }
-
- cr = crypt(cred->bv_val, pw);
-
- if( cr == NULL || cr[0] == '\0' ) {
- /* salt must have been invalid */
- return -1;
+ return LUTIL_PASSWD_ERR;
}
- return strcmp(pw, cr) ? 1 : 0;
-
+ return lutil_cryptptr( cred->bv_val, pw, NULL );
}
# endif
#endif
@@ -936,9 +1023,10 @@ static int chk_unix(
/* PASSWORD GENERATION ROUTINES */
#ifdef LUTIL_SHA1_BYTES
-static struct berval *hash_ssha1(
+static int hash_ssha1(
const struct berval *scheme,
const struct berval *passwd,
+ struct berval *hash,
const char **text )
{
lutil_SHA1_CTX SHA1context;
@@ -953,7 +1041,7 @@ static struct berval *hash_ssha1(
salt.bv_len = sizeof(saltdata);
if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
lutil_SHA1Init( &SHA1context );
@@ -963,12 +1051,13 @@ 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 lutil_passwd_string64( scheme, &digest, hash, &salt);
}
-static struct berval *hash_sha1(
+static int hash_sha1(
const struct berval *scheme,
const struct berval *passwd,
+ struct berval *hash,
const char **text )
{
lutil_SHA1_CTX SHA1context;
@@ -982,13 +1071,14 @@ 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 lutil_passwd_string64( scheme, &digest, hash, NULL);
}
#endif
-static struct berval *hash_smd5(
+static int hash_smd5(
const struct berval *scheme,
const struct berval *passwd,
+ struct berval *hash,
const char **text )
{
lutil_MD5_CTX MD5context;
@@ -1003,7 +1093,7 @@ static struct berval *hash_smd5(
salt.bv_len = sizeof(saltdata);
if( lutil_entropy( (unsigned char *) salt.bv_val, salt.bv_len) < 0 ) {
- return NULL;
+ return LUTIL_PASSWD_ERR;
}
lutil_MD5Init( &MD5context );
@@ -1013,12 +1103,13 @@ 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 lutil_passwd_string64( scheme, &digest, hash, &salt );
}
-static struct berval *hash_md5(
+static int hash_md5(
const struct berval *scheme,
const struct berval *passwd,
+ struct berval *hash,
const char **text )
{
lutil_MD5_CTX MD5context;
@@ -1034,34 +1125,34 @@ 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 lutil_passwd_string64( scheme, &digest, hash, NULL );
;
}
#ifdef SLAPD_LMHASH
-static struct berval *hash_lanman(
+static int hash_lanman(
const struct berval *scheme,
const struct berval *passwd,
+ struct berval *hash,
const char **text )
{
- int i;
+ ber_len_t i;
char UcasePassword[15];
- des_cblock key;
- des_key_schedule schedule;
- des_cblock StdText = "KGS!@#$%";
- des_cblock PasswordHash1, PasswordHash2;
+ des_key key;
+ des_context schedule;
+ des_data_block StdText = "KGS!@#$%";
+ des_data_block PasswordHash1, PasswordHash2;
char PasswordHash[33];
- struct berval hash;
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 );
@@ -1082,35 +1173,37 @@ static struct berval *hash_lanman(
PasswordHash2[0],PasswordHash2[1],PasswordHash2[2],PasswordHash2[3],
PasswordHash2[4],PasswordHash2[5],PasswordHash2[6],PasswordHash2[7] );
- hash.bv_val = PasswordHash;
- 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(
+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;
+ char *save;
+ int rc;
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++ ) {
@@ -1126,38 +1219,45 @@ static struct berval *hash_crypt(
snprintf( (char *) salt, sizeof(entropy), salt_format, entropy );
}
- hash.bv_val = crypt( passwd->bv_val, (char *) salt );
+ rc = lutil_cryptptr( passwd->bv_val, (char *) salt, &hash->bv_val );
+ if ( rc != LUTIL_PASSWD_OK ) return rc;
- if( hash.bv_val == NULL ) return NULL;
+ if( hash->bv_val == NULL ) return -1;
- hash.bv_len = strlen( hash.bv_val );
+ hash->bv_len = strlen( hash->bv_val );
- if( hash.bv_len == 0 ) {
- return NULL;
- }
+ 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
- free( salt_format );
+ ber_memfree( salt_format );
- salt_format = format != NULL ? strdup( format ) : NULL;
+ salt_format = format != NULL ? ber_strdup( format ) : NULL;
#endif
return 0;
}
#ifdef SLAPD_CLEARTEXT
-static struct berval *hash_clear(
+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