sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3:smbd:password_in_history: treat entry with 0 salt as 0 + plain nt hash

Browse Source 
This is to introduce a new format of the password history, maintaining backwards
compatibility: The old format was 16 byte hash + 16 byte md5(salt + nt hash).
The new format is 16 zero bytes and 16 bytes nt hash.

This will allow us to respect the last X entries of the nt password history
when deciding whether to increment the bad password count.

This is part of the fix for bug #4347 .

Michael
This commit is contained in:
Michael Adam 2010-01-05 16:58:30 +01:00
parent 801edeccc6
commit 667b6f3322
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/smbd/chgpasswd.c
View File

@ -1031,13 +1031,31 @@ bool password_in_history(uint8_t nt_pw[NT_HASH_LEN],
/* Ignore zero valued entries. */
continue;
}
/* Create salted versions of new to compare. */
E_md5hash(current_salt, nt_pw, new_nt_pw_salted_md5_hash);
if (memcmp(new_nt_pw_salted_md5_hash,
old_nt_pw_salted_md5_hash,
SALTED_MD5_HASH_LEN) == 0) {
return true;
if (memcmp(zero_md5_nt_pw, current_salt,
PW_HISTORY_SALT_LEN) == 0)
{
/*
* New format: zero salt and then plain nt hash.
* Directly compare the hashes.
*/
if (memcmp(nt_pw, old_nt_pw_salted_md5_hash,
SALTED_MD5_HASH_LEN) == 0)
{
return true;
}
} else {
/*
* Old format: md5sum of salted nt hash.
* Create salted version of new pw to compare.
*/
E_md5hash(current_salt, nt_pw, new_nt_pw_salted_md5_hash);
if (memcmp(new_nt_pw_salted_md5_hash,
old_nt_pw_salted_md5_hash,
SALTED_MD5_HASH_LEN) == 0) {
return true;
}
}
}
return false;