Attachment 579743 Details for Bug 815617 – patch hanlding crypt() returning NULL

[patch] patch hanlding crypt() returning NULL

ppp-2.4.5-crypt.patch (text/plain), 1.42 KB, created by Paul Wouters on 2012-04-24 04:26:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Wouters

Created: 2012-04-24 04:26:45 UTC

Size: 1.42 KB

patch

obsolete

>diff -Naur ppp-2.4.5-orig/pppd/auth.c ppp-2.4.5/pppd/auth.c
>--- ppp-2.4.5-orig/pppd/auth.c	2012-04-24 00:09:18.443659777 -0400
>+++ ppp-2.4.5/pppd/auth.c	2012-04-24 00:20:31.276731393 -0400
>@@ -1516,9 +1516,13 @@
> 	    }
> 	    if (secret[0] != 0 && !login_secret) {
> 		/* password given in pap-secrets - must match */
>-		if ((cryptpap || strcmp(passwd, secret) != 0)
>-		    && strcmp(crypt(passwd, secret), secret) != 0)
>-		    ret = UPAP_AUTHNAK;
>+		if (cryptpap || strcmp(passwd, secret) != 0) 
>+			   ret = UPAP_AUTHNAK;
>+		else {
>+		    char *cryptbuf = crypt(passwd, secret);
>+		    if((cryptbuf == NULL) || strcmp(cryptbuf, secret) != 0)
>+			   ret = UPAP_AUTHNAK;
>+		}
> 	    }
> 	}
> 	fclose(f);
>diff -Naur ppp-2.4.5-orig/pppd/session.c ppp-2.4.5/pppd/session.c
>--- ppp-2.4.5-orig/pppd/session.c	2009-11-16 17:26:07.000000000 -0500
>+++ ppp-2.4.5/pppd/session.c	2012-04-24 00:21:14.614189352 -0400
>@@ -348,9 +348,13 @@
> 	/*
> 	 * If no passwd, don't let them login if we're authenticating.
> 	 */
>-        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2
>-            || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0)
>+        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2) {
>             return SESSION_FAILED;
>+	} else {
>+	    char *cryptbuf = crypt(passwd, pw->pw_passwd);
>+	    if((cryptbuf == NULL) || strcmp(cryptbuf, pw->pw_passwd) != 0)
>+               return SESSION_FAILED;
>+	}
>     }
> 
> #endif /* #ifdef USE_PAM */

Actions: View | Diff

Attachments on bug 815617: 579743 | 585827