Attachment 771 Details for Bug 971 – Make kbdint call driver even for invalid logins

[patch] Make kbdint call driver even for invalid logins

openbsd-sshd-kbdint-leak.patch (text/plain), 1.23 KB, created by Darren Tucker on 2005-01-19 16:39:34 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-01-19 16:39:34 AEDT

Size: 1.23 KB

patch

obsolete

>Index: auth-bsdauth.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth-bsdauth.c,v
>retrieving revision 1.5
>diff -u -r1.5 auth-bsdauth.c
>--- auth-bsdauth.c	2002/06/30 21:59:45	1.5
>+++ auth-bsdauth.c	2005/01/19 05:35:26
>@@ -83,6 +83,9 @@
> 	Authctxt *authctxt = ctx;
> 	int authok;
> 
>+	if (!authctxt->valid)
>+		return -1;
>+
> 	if (authctxt->as == 0)
> 		error("bsdauth_respond: no bsd auth session");
> 
>Index: auth2-chall.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth2-chall.c,v
>retrieving revision 1.21
>diff -u -r1.21 auth2-chall.c
>--- auth2-chall.c	2004/06/01 14:20:45	1.21
>+++ auth2-chall.c	2005/01/19 05:35:26
>@@ -268,12 +268,7 @@
> 	}
> 	packet_check_eom();
> 
>-	if (authctxt->valid) {
>-		res = kbdintctxt->device->respond(kbdintctxt->ctxt,
>-		    nresp, response);
>-	} else {
>-		res = -1;
>-	}
>+	res = kbdintctxt->device->respond(kbdintctxt->ctxt, nresp, response);
> 
> 	for (i = 0; i < nresp; i++) {
> 		memset(response[i], 'r', strlen(response[i]));
>@@ -285,7 +280,7 @@
> 	switch (res) {
> 	case 0:
> 		/* Success! */
>-		authenticated = 1;
>+		authenticated = authctxt->valid ? 1 : 0;
> 		break;
> 	case 1:
> 		/* Authentication needs further interaction */

Actions: View | Diff

Attachments on bug 971: 765 | 766 | 771 | 775