Attachment 580036 Details for Bug 815993 – patch hanlding crypt() returning NULL

[patch] patch hanlding crypt() returning NULL

openssh-5.9p1-crypt.patch (text/plain), 1.54 KB, created by Paul Wouters on 2012-04-25 01:42:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Wouters

Created: 2012-04-25 01:42:54 UTC

Size: 1.54 KB

patch

obsolete

>diff -Naur openssh-5.9p1-orig/auth-passwd.c openssh-5.9p1/auth-passwd.c
>--- openssh-5.9p1-orig/auth-passwd.c	2009-03-07 19:40:28.000000000 -0500
>+++ openssh-5.9p1/auth-passwd.c	2012-04-24 20:56:59.372068165 -0400
>@@ -205,6 +205,8 @@
> 	encrypted_password = xcrypt(password,
> 	    (pw_password[0] && pw_password[1]) ? pw_password : "xx");
> 
>+	if(encrypted_password == NULL) /* underlying crypt() call failed */
>+		return 0; 
> 	/*
> 	 * Authentication is accepted if the encrypted passwords
> 	 * are identical.
>diff -Naur openssh-5.9p1-orig/openbsd-compat/port-uw.c openssh-5.9p1/openbsd-compat/port-uw.c
>--- openssh-5.9p1-orig/openbsd-compat/port-uw.c	2010-06-26 19:45:16.000000000 -0400
>+++ openssh-5.9p1/openbsd-compat/port-uw.c	2012-04-24 20:58:59.980078866 -0400
>@@ -77,6 +77,8 @@
> 	}
> 	else
> #endif /* UNIXWARE_LONG_PASSWORDS */
>+		if(password == NULL) /* underlying crypt() call failed */
>+			return 0;
> 		result = (strcmp(xcrypt(password, salt), pw_password) == 0);
> 
> #ifdef USE_LIBIAF
>diff -Naur openssh-5.9p1-orig/pam_ssh_agent_auth-0.9.2/openbsd-compat/port-uw.c openssh-5.9p1/pam_ssh_agent_auth-0.9.2/openbsd-compat/port-uw.c
>--- openssh-5.9p1-orig/pam_ssh_agent_auth-0.9.2/openbsd-compat/port-uw.c	2009-01-05 02:31:07.000000000 -0500
>+++ openssh-5.9p1/pam_ssh_agent_auth-0.9.2/openbsd-compat/port-uw.c	2012-04-24 20:57:59.269570902 -0400
>@@ -77,6 +77,8 @@
> 	}
> 	else
> #endif /* UNIXWARE_LONG_PASSWORDS */
>+		if (password == NULL) /* underlying crypt() call failed */
>+			return 0;
> 		result = (strcmp(xcrypt(password, salt), pw_password) == 0);
> 
> #ifdef USE_LIBIAF

Actions: View | Diff

Attachments on bug 815993: 580036