1 files changed, 44 insertions, 66 deletions

diff --git a/auth-chall.c b/auth-chall.c
index f3502f4ee..45e0c3452 100644
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -23,82 +23,60 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-chall.c,v 1.7 2001/04/05 10:42:47 markus Exp $");
+RCSID("$OpenBSD: auth-chall.c,v 1.8 2001/05/18 14:13:28 markus Exp $");
 
 #include "auth.h"
 #include "log.h"
+#include "xmalloc.h"
 
-#ifdef BSD_AUTH
-char *
-get_challenge(Authctxt *authctxt, char *devs)
-{
-        char *challenge;
+/* limited protocol v1 interface to kbd-interactive authentication */
 
-        if (authctxt->as != NULL) {
-                debug2("try reuse session");
-                challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE);
-                if (challenge != NULL) {
-                        debug2("reuse bsd auth session");
-                        return challenge;
-                }
-                auth_close(authctxt->as);
-                authctxt->as = NULL;
-        }
-        debug2("new bsd auth session");
-        if (devs == NULL || strlen(devs) == 0)
-                devs = authctxt->style;
-        debug3("bsd auth: devs %s", devs ? devs : "<default>");
-        authctxt->as = auth_userchallenge(authctxt->user, devs, "auth-ssh",
-            &challenge);
-        if (authctxt->as == NULL)
-                return NULL;
-        debug2("get_challenge: <%s>", challenge ? challenge : "EMPTY");
-        return challenge;
-}
-int
-verify_response(Authctxt *authctxt, char *response)
-{
-        int authok;
-
-        if (authctxt->as == 0)
-                error("verify_response: no bsd auth session");
-        authok = auth_userresponse(authctxt->as, response, 0);
-        authctxt->as = NULL;
-        debug("verify_response: <%s> = <%d>", response, authok);
-        return authok != 0;
-}
-#else
-#ifdef SKEY
-#include <skey.h>
+extern KbdintDevice *devices[];
+static KbdintDevice *device;
 
 char *
-get_challenge(Authctxt *authctxt, char *devs)
+get_challenge(Authctxt *authctxt)
 {
-        static char challenge[1024];
-        struct skey skey;
-        if (skeychallenge(&skey, authctxt->user, challenge) == -1)
+        char *challenge, *name, *info, **prompts;
+        u_int i, numprompts;
+        u_int *echo_on;
+
+        device = devices[0]; /* we always use the 1st device for protocol 1 */
+        if (device == NULL)
                 return NULL;
-        strlcat(challenge, "\nS/Key Password: ", sizeof challenge);
-        return challenge;
-}
-int
-verify_response(Authctxt *authctxt, char *response)
-{
-        return (authctxt->valid &&
-            skey_haskey(authctxt->pw->pw_name) == 0 &&
-            skey_passcheck(authctxt->pw->pw_name, response) != -1);
-}
-#else
-/* not available */
-char *
-get_challenge(Authctxt *authctxt, char *devs)
-{
-        return NULL;
+        if ((authctxt->kbdintctxt = device->init_ctx(authctxt)) == NULL)
+                return NULL;
+        if (device->query(authctxt->kbdintctxt, &name, &info,
+            &numprompts, &prompts, &echo_on)) {
+                device->free_ctx(authctxt->kbdintctxt);
+                authctxt->kbdintctxt = NULL;
+                return NULL;
+        }
+        if (numprompts < 1)
+                fatal("get_challenge: numprompts < 1");
+        challenge = xstrdup(prompts[0]);
+        for (i = 0; i < numprompts; i++)
+                xfree(prompts[i]);
+        xfree(prompts);
+        xfree(name);
+        xfree(echo_on);
+        xfree(info);
+
+        return (challenge);
 }
 int
-verify_response(Authctxt *authctxt, char *response)
+verify_response(Authctxt *authctxt, const char *response)
 {
-        return 0;
+        char *resp[1];
+        int res;
+
+        if (device == NULL)
+                return 0;
+        if (authctxt->kbdintctxt == NULL)
+                return 0;
+        resp[0] = (char *)response;
+        res = device->respond(authctxt->kbdintctxt, 1, resp);
+        device->free_ctx(authctxt->kbdintctxt);
+        authctxt->kbdintctxt = NULL;
+        return res ? 0 : 1;
 }
-#endif
-#endif