diff --git a/pam-0.99.7.1-unix-bigcrypt.patch b/pam-0.99.7.1-unix-bigcrypt.patch index e5f53d6..f7bdbed 100644 --- a/pam-0.99.7.1-unix-bigcrypt.patch +++ b/pam-0.99.7.1-unix-bigcrypt.patch @@ -1,15 +1,15 @@ ---- Linux-PAM-0.99.7.1/modules/pam_unix/support.c.bigcrypt 2007-02-21 20:30:24.000000000 +0100 -+++ Linux-PAM-0.99.7.1/modules/pam_unix/support.c 2007-02-21 21:17:29.000000000 +0100 -@@ -694,7 +694,7 @@ +--- Linux-PAM-0.99.7.1/modules/pam_unix/support.c.bigcrypt 2007-01-23 10:41:21.000000000 +0100 ++++ Linux-PAM-0.99.7.1/modules/pam_unix/support.c 2007-06-01 15:11:51.000000000 +0200 +@@ -679,7 +679,7 @@ } } } else { -- int salt_len; -+ size_t salt_len; - strip_hpux_aging(salt); - salt_len = strlen(salt); +- int salt_len = strlen(salt); ++ size_t salt_len = strlen(salt); if (!salt_len) { -@@ -706,19 +706,19 @@ + /* the stored password is NULL */ + if (off(UNIX__NONULL, ctrl)) {/* this means we've succeeded */ +@@ -689,19 +689,19 @@ D(("user has empty password - access denied")); retval = PAM_AUTH_ERR; } @@ -33,7 +33,7 @@ } } else { /* -@@ -732,7 +732,7 @@ +@@ -715,7 +715,7 @@ /* the moment of truth -- do we agree with the password? */ D(("comparing state of pp[%s] and salt[%s]", pp, salt)); @@ -42,9 +42,9 @@ retval = PAM_SUCCESS; } else { retval = PAM_AUTH_ERR; ---- Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c.bigcrypt 2007-02-21 20:30:24.000000000 +0100 -+++ Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c 2007-02-21 21:18:57.000000000 +0100 -@@ -159,7 +159,7 @@ +--- Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c.bigcrypt 2006-10-24 12:01:49.000000000 +0200 ++++ Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c 2007-06-01 15:08:46.000000000 +0200 +@@ -144,7 +144,7 @@ char *salt = NULL; char *pp = NULL; int retval = PAM_AUTH_ERR; @@ -53,7 +53,7 @@ /* UNIX passwords area */ setpwent(); -@@ -205,6 +205,8 @@ +@@ -189,6 +189,8 @@ return (nullok == 0) ? PAM_AUTH_ERR : PAM_SUCCESS; } if (p == NULL || strlen(p) == 0) { @@ -62,7 +62,7 @@ return PAM_AUTHTOK_ERR; } -@@ -212,11 +214,13 @@ +@@ -196,11 +198,13 @@ retval = PAM_AUTH_ERR; if (!strncmp(salt, "$1$", 3)) { pp = Goodcrypt_md5(p, salt); @@ -78,7 +78,7 @@ retval = PAM_SUCCESS; } } else if (*salt == '$') { -@@ -225,10 +229,10 @@ +@@ -209,10 +213,10 @@ * libcrypt nows about it? We should try it. */ pp = x_strdup (crypt(p, salt)); @@ -91,7 +91,7 @@ retval = PAM_AUTH_ERR; } else { pp = bigcrypt(p, salt); -@@ -239,24 +243,21 @@ +@@ -223,24 +227,21 @@ * have been truncated for storage relative to the output * of bigcrypt here. As such we need to compare only the * stored string with the subset of bigcrypt's result.