- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / auth-chall.c

diff --git a/auth-chall.c b/auth-chall.c
index 6b7c8bd13ba3793c8e23fc584059c45cba894e3e..919b1eaa43cfcdf2ec09bf1c95d05f2861c7f1a6 100644 (file)
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -23,16 +24,23 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-chall.c,v 1.8 2001/05/18 14:13:28 markus Exp $");
 
+#include <sys/types.h>
+
+#include <stdarg.h>
+
+#include "xmalloc.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
 #include "log.h"
-#include "xmalloc.h"
+#include "servconf.h"
 
 /* limited protocol v1 interface to kbd-interactive authentication */
 
 extern KbdintDevice *devices[];
 static KbdintDevice *device;
+extern ServerOptions options;
 
 char *
 get_challenge(Authctxt *authctxt)
@@ -41,6 +49,11 @@ get_challenge(Authctxt *authctxt)
        u_int i, numprompts;
        u_int *echo_on;
 
+#ifdef USE_PAM
+       if (!options.use_pam)
+               remove_kbdint_device("pam");
+#endif
+
        device = devices[0]; /* we always use the 1st device for protocol 1 */
        if (device == NULL)
                return NULL;
@@ -67,36 +80,38 @@ get_challenge(Authctxt *authctxt)
 int
 verify_response(Authctxt *authctxt, const char *response)
 {
-       char *resp[1];
-       int res;
+       char *resp[1], *name, *info, **prompts;
+       u_int i, numprompts, *echo_on;
+       int authenticated = 0;
 
        if (device == NULL)
                return 0;
        if (authctxt->kbdintctxt == NULL)
                return 0;
        resp[0] = (char *)response;
-       res = device->respond(authctxt->kbdintctxt, 1, resp);
-       if (res == 1) {
-               /* postponed - send a null query just in case */
-               char *name, *info, **prompts;
-               u_int i, numprompts, *echo_on;
+       switch (device->respond(authctxt->kbdintctxt, 1, resp)) {
+       case 0: /* Success */
+               authenticated = 1;
+               break;
+       case 1: /* Postponed - retry with empty query for PAM */
+               if ((device->query(authctxt->kbdintctxt, &name, &info,
+                   &numprompts, &prompts, &echo_on)) != 0)
+                       break;
+               if (numprompts == 0 &&
+                   device->respond(authctxt->kbdintctxt, 0, resp) == 0)
+                       authenticated = 1;
 
-               res = device->query(authctxt->kbdintctxt, &name, &info,
-                   &numprompts, &prompts, &echo_on);
-               if (res == 0) {
-                       for (i = 0; i < numprompts; i++)
-                               xfree(prompts[i]);
-                       xfree(prompts);
-                       xfree(name);
-                       xfree(echo_on);
-                       xfree(info);
-               }
-               /* if we received more prompts, we're screwed */
-               res = (numprompts != 0);
+               for (i = 0; i < numprompts; i++)
+                       xfree(prompts[i]);
+               xfree(prompts);
+               xfree(name);
+               xfree(echo_on);
+               xfree(info);
+               break;
        }
        device->free_ctx(authctxt->kbdintctxt);
        authctxt->kbdintctxt = NULL;
-       return res ? 0 : 1;
+       return authenticated;
 }
 void
 abandon_challenge_response(Authctxt *authctxt)