mirrors/linux-pam
0
0
Fork 0
mirror of https://github.com/linux-pam/linux-pam.git synced 2024-11-24 02:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Relevant BUGIDs:

Browse Source 
Purpose of commit: bugfix

Commit summary:
---------------

2006-10-24  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_unix/support.c (_unix_verify_password): Try system
        crypt() if we don't know the hash alogorithm.
        * modules/pam_unix/unix_chkpwd.c (_unix_verify_password): Likewise.
This commit is contained in:
Thorsten Kukuk 2006-10-24 13:07:51 +00:00
parent d6acfdc384
commit 06250234a0
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,9 @@
2006-10-24 Thorsten Kukuk <kukuk@thkukuk.de>
* modules/pam_unix/support.c (_unix_verify_password): Try system
crypt() if we don't know the hash alogorithm.
* modules/pam_unix/unix_chkpwd.c (_unix_verify_password): Likewise.
2006-10-13 Tomas Mraz <t8m@centrum.cz>
* doc/mwg/Linux-PAM_MWG.xml: Add id[s] to section[s].
@ -12,9 +18,9 @@
* doc/sag/Linux-PAM_SAG.xml: Add id to book.
* doc/adg/Linux-PAM_ADG.xml: Add id to book.
* doc/mwg/Linux-PAM_MWG.xml: Add id to book.
2006-10-07 Thorsten Kukuk <kukuk@suse.de>
2006-10-07 Thorsten Kukuk <kukuk@thkukuk.de>
* po/hu.po: Updated hungarian translation (from
Kalman Kemenczy <kkemenczy@novell.com>)

8
modules/pam_unix/support.c
View File

@ -689,7 +689,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name
D(("user has empty password - access denied"));
retval = PAM_AUTH_ERR;
}
} else if (!p || (*salt == '*') || (salt_len < 13)) {
} else if (!p || (*salt == '*')) {
retval = PAM_AUTH_ERR;
} else {
if (!strncmp(salt, "$1$", 3)) {
@ -698,6 +698,12 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name
_pam_delete(pp);
pp = Brokencrypt_md5(p, salt);
}
} else if (*salt == '$') {
/*
* Ok, we don't know the crypt algorithm, but maybe
* libcrypt nows about it? We should try it.
*/
pp = x_strdup (crypt(p, salt));
} else {
pp = bigcrypt(p, salt);
}

13
modules/pam_unix/unix_chkpwd.c
View File

@ -40,9 +40,7 @@ static int selinux_enabled=-1;
#include <security/_pam_macros.h>
#include "md5.h"
extern char *crypt(const char *key, const char *salt);
extern char *bigcrypt(const char *key, const char *salt);
#include "bigcrypt.h"
/* syslogging function for errors and other information */
@ -205,6 +203,15 @@ static int _unix_verify_password(const char *name, const char *p, int nullok)
if (strcmp(pp, salt) == 0)
retval = PAM_SUCCESS;
}
} else if (*salt == '$') {
/*
* Ok, we don't know the crypt algorithm, but maybe
* libcrypt nows about it? We should try it.
*/
pp = x_strdup (crypt(p, salt));
if (strcmp(pp, salt) == 0) {
retval = PAM_SUCCESS;
}
} else if ((*salt == '*') || (salt_len < 13)) {
retval = PAM_AUTH_ERR;
} else {