Import of OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / auth2-chall.c

diff --git a/openssh/auth2-chall.c b/openssh/auth2-chall.c
index 5e6a691f808920ae778c466b43194953a2e39857..9f1d932756b3283e6a59aa16949c12db438edc34 100644 (file)
--- a/openssh/auth2-chall.c
+++ b/openssh/auth2-chall.c
@@ -23,10 +23,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth2-chall.c,v 1.8 2001/09/27 15:31:17 markus Exp $");
+RCSID("$OpenBSD: auth2-chall.c,v 1.16 2002/01/13 17:57:37 markus Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
+#include "buffer.h"
 #include "packet.h"
 #include "xmalloc.h"
 #include "dispatch.h"
@@ -35,7 +36,7 @@ RCSID("$OpenBSD: auth2-chall.c,v 1.8 2001/09/27 15:31:17 markus Exp $");
 
 static int auth2_challenge_start(Authctxt *);
 static int send_userauth_info_request(Authctxt *);
-static void input_userauth_info_response(int, int, void *);
+static void input_userauth_info_response(int, u_int32_t, void *);
 
 #ifdef BSD_AUTH
 extern KbdintDevice bsdauth_device;
@@ -68,22 +69,25 @@ static KbdintAuthctxt *
 kbdint_alloc(const char *devs)
 {
        KbdintAuthctxt *kbdintctxt;
+       Buffer b;
        int i;
-       char buf[1024];
 
        kbdintctxt = xmalloc(sizeof(KbdintAuthctxt));
        if (strcmp(devs, "") == 0) {
-               buf[0] = '\0';
+               buffer_init(&b);
                for (i = 0; devices[i]; i++) {
-                       if (i != 0)
-                               strlcat(buf, ",", sizeof(buf));
-                       strlcat(buf, devices[i]->name, sizeof(buf));
+                       if (buffer_len(&b) > 0)
+                               buffer_append(&b, ",", 1);
+                       buffer_append(&b, devices[i]->name,
+                           strlen(devices[i]->name));
                }
-               debug("kbdint_alloc: devices '%s'", buf);
-               kbdintctxt->devices = xstrdup(buf);
+               buffer_append(&b, "\0", 1);
+               kbdintctxt->devices = xstrdup(buffer_ptr(&b));
+               buffer_free(&b);
        } else {
                kbdintctxt->devices = xstrdup(devs);
        }
+       debug("kbdint_alloc: devices '%s'", kbdintctxt->devices);
        kbdintctxt->ctxt = NULL;
        kbdintctxt->device = NULL;
 
@@ -151,11 +155,23 @@ auth2_challenge(Authctxt *authctxt, char *devs)
 
        if (authctxt->user == NULL || !devs)
                return 0;
-       if (authctxt->kbdintctxt == NULL) 
+       if (authctxt->kbdintctxt == NULL)
                authctxt->kbdintctxt = kbdint_alloc(devs);
        return auth2_challenge_start(authctxt);
 }
 
+/* unregister kbd-int callbacks and context */
+void
+auth2_challenge_stop(Authctxt *authctxt)
+{
+       /* unregister callback */
+       dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
+       if (authctxt->kbdintctxt != NULL)  {
+               kbdint_free(authctxt->kbdintctxt);
+               authctxt->kbdintctxt = NULL;
+       }
+}
+
 /* side effect: sets authctxt->postponed if a reply was sent*/
 static int
 auth2_challenge_start(Authctxt *authctxt)
@@ -166,21 +182,18 @@ auth2_challenge_start(Authctxt *authctxt)
            kbdintctxt->devices ?  kbdintctxt->devices : "<empty>");
 
        if (kbdint_next_device(kbdintctxt) == 0) {
-               kbdint_free(kbdintctxt);
-               authctxt->kbdintctxt = NULL;
+               auth2_challenge_stop(authctxt);
                return 0;
        }
        debug("auth2_challenge_start: trying authentication method '%s'",
            kbdintctxt->device->name);
 
        if ((kbdintctxt->ctxt = kbdintctxt->device->init_ctx(authctxt)) == NULL) {
-               kbdint_free(kbdintctxt);
-               authctxt->kbdintctxt = NULL;
+               auth2_challenge_stop(authctxt);
                return 0;
        }
        if (send_userauth_info_request(authctxt) == 0) {
-               kbdint_free(kbdintctxt);
-               authctxt->kbdintctxt = NULL;
+               auth2_challenge_stop(authctxt);
                return 0;
        }
        dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE,
@@ -225,7 +238,7 @@ send_userauth_info_request(Authctxt *authctxt)
 }
 
 static void
-input_userauth_info_response(int type, int plen, void *ctxt)
+input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
        KbdintAuthctxt *kbdintctxt;
@@ -248,7 +261,7 @@ input_userauth_info_response(int type, int plen, void *ctxt)
                for (i = 0; i < nresp; i++)
                        response[i] = packet_get_string(NULL);
        }
-       packet_done();
+       packet_check_eom();
 
        if (authctxt->valid) {
                res = kbdintctxt->device->respond(kbdintctxt->ctxt,
@@ -271,10 +284,8 @@ input_userauth_info_response(int type, int plen, void *ctxt)
                break;
        case 1:
                /* Authentication needs further interaction */
-               authctxt->postponed = 1;
-               if (send_userauth_info_request(authctxt) == 0) {
-                       authctxt->postponed = 0;
-               }
+               if (send_userauth_info_request(authctxt) == 1)
+                       authctxt->postponed = 1;
                break;
        default:
                /* Failure! */
@@ -284,18 +295,12 @@ input_userauth_info_response(int type, int plen, void *ctxt)
        len = strlen("keyboard-interactive") + 2 +
                strlen(kbdintctxt->device->name);
        method = xmalloc(len);
-       method[0] = '\0';
-       strlcat(method, "keyboard-interactive", len);
-       strlcat(method, "/", len);
-       strlcat(method, kbdintctxt->device->name, len);
+       snprintf(method, len, "keyboard-interactive/%s",
+           kbdintctxt->device->name);
 
        if (!authctxt->postponed) {
-               /* unregister callback */
-               dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
-
                if (authenticated) {
-                       kbdint_free(kbdintctxt);
-                       authctxt->kbdintctxt = NULL;
+                       auth2_challenge_stop(authctxt);
                } else {
                        /* start next device */
                        /* may set authctxt->postponed */