1 files changed, 19 insertions, 18 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index 6505d4009..98f3093ce 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.36 2012/12/03 00:14:06 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.38 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -147,15 +147,13 @@ kbdint_free(KbdintAuthctxt *kbdintctxt)
 {
         if (kbdintctxt->device)
                 kbdint_reset_device(kbdintctxt);
-        if (kbdintctxt->devices) {
-                xfree(kbdintctxt->devices);
-                kbdintctxt->devices = NULL;
-        }
-        xfree(kbdintctxt);
+        free(kbdintctxt->devices);
+        bzero(kbdintctxt, sizeof(*kbdintctxt));
+        free(kbdintctxt);
 }
 /* get next device */
 static int
-kbdint_next_device(KbdintAuthctxt *kbdintctxt)
+kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
 {
         size_t len;
         char *t;
@@ -169,12 +167,16 @@ kbdint_next_device(KbdintAuthctxt *kbdintctxt)
 
                 if (len == 0)
                         break;
-                for (i = 0; devices[i]; i++)
+                for (i = 0; devices[i]; i++) {
+                        if (!auth2_method_allowed(authctxt,
+                            "keyboard-interactive", devices[i]->name))
+                                continue;
                         if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0)
                                 kbdintctxt->device = devices[i];
+                }
                 t = kbdintctxt->devices;
                 kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL;
-                xfree(t);
+                free(t);
                 debug2("kbdint_next_device: devices %s", kbdintctxt->devices ?
                     kbdintctxt->devices : "<empty>");
         } while (kbdintctxt->devices && !kbdintctxt->device);
@@ -221,7 +223,7 @@ auth2_challenge_start(Authctxt *authctxt)
         debug2("auth2_challenge_start: devices %s",
             kbdintctxt->devices ?  kbdintctxt->devices : "<empty>");
 
-        if (kbdint_next_device(kbdintctxt) == 0) {
+        if (kbdint_next_device(authctxt, kbdintctxt) == 0) {
                 auth2_challenge_stop(authctxt);
                 return 0;
         }
@@ -268,11 +270,11 @@ send_userauth_info_request(Authctxt *authctxt)
         packet_write_wait();
 
         for (i = 0; i < kbdintctxt->nreq; i++)
-                xfree(prompts[i]);
-        xfree(prompts);
-        xfree(echo_on);
-        xfree(name);
-        xfree(instr);
+                free(prompts[i]);
+        free(prompts);
+        free(echo_on);
+        free(name);
+        free(instr);
         return 1;
 }
 
@@ -311,10 +313,9 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
 
         for (i = 0; i < nresp; i++) {
                 memset(response[i], 'r', strlen(response[i]));
-                xfree(response[i]);
+                free(response[i]);
         }
-        if (response)
-                xfree(response);
+        free(response);
 
         switch (res) {
         case 0: