import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 73 insertions, 34 deletions

diff --git a/clientloop.c b/clientloop.c
index b76f7cfe0..c7362caa8 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clientloop.c,v 1.178 2007/02/20 10:25:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -59,20 +60,43 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.149 2005/12/30 15:56:37 reyk Exp $");
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/socket.h>
+
+#include <ctype.h>
+#include <errno.h>
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <pwd.h>
+#include <unistd.h>
+
+#include "xmalloc.h"
 #include "ssh.h"
 #include "ssh1.h"
 #include "ssh2.h"
-#include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
 #include "compat.h"
 #include "channels.h"
 #include "dispatch.h"
-#include "buffer.h"
-#include "bufaux.h"
 #include "key.h"
+#include "cipher.h"
 #include "kex.h"
 #include "log.h"
 #include "readconf.h"
@@ -118,7 +142,7 @@ static volatile sig_atomic_t received_signal = 0;
 static int in_non_blocking_mode = 0;
 
 /* Common data for the client loop code. */
-static int quit_pending;        /* Set to non-zero to quit the client loop. */
+static volatile sig_atomic_t quit_pending; /* Set non-zero to quit the loop. */
 static int escape_char;         /* Escape character. */
 static int escape_pending;      /* Last character was the escape character */
 static int last_was_cr;         /* Last character was a newline. */
@@ -178,7 +202,7 @@ enter_non_blocking(void)
  * Signal handler for the window change signal (SIGWINCH).  This just sets a
  * flag indicating that the window has changed.
  */
-
+/*ARGSUSED */
 static void
 window_change_handler(int sig)
 {
@@ -190,7 +214,7 @@ window_change_handler(int sig)
  * Signal handler for signals that cause the program to terminate.  These
  * signals must be trapped to restore terminal modes.
  */
-
+/*ARGSUSED */
 static void
 signal_handler(int sig)
 {
@@ -422,10 +446,10 @@ client_check_window_change(void)
                 if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)
                         return;
                 packet_start(SSH_CMSG_WINDOW_SIZE);
-                packet_put_int(ws.ws_row);
-                packet_put_int(ws.ws_col);
-                packet_put_int(ws.ws_xpixel);
-                packet_put_int(ws.ws_ypixel);
+                packet_put_int((u_int)ws.ws_row);
+                packet_put_int((u_int)ws.ws_col);
+                packet_put_int((u_int)ws.ws_xpixel);
+                packet_put_int((u_int)ws.ws_ypixel);
                 packet_send();
         }
 }
@@ -440,8 +464,10 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
 static void
 server_alive_check(void)
 {
-        if (++server_alive_timeouts > options.server_alive_count_max)
-                packet_disconnect("Timeout, server not responding.");
+        if (++server_alive_timeouts > options.server_alive_count_max) {
+                logit("Timeout, server not responding.");
+                cleanup_exit(255);
+        }
         packet_start(SSH2_MSG_GLOBAL_REQUEST);
         packet_put_cstring("keepalive@openssh.com");
         packet_put_char(1);     /* boolean: want reply */
@@ -569,7 +595,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
 }
 
 static void
-client_process_net_input(fd_set * readset)
+client_process_net_input(fd_set *readset)
 {
         int len;
         char buf[8192];
@@ -677,11 +703,11 @@ client_extra_session2_setup(int id, void *arg)
 }
 
 static void
-client_process_control(fd_set * readset)
+client_process_control(fd_set *readset)
 {
         Buffer m;
         Channel *c;
-        int client_fd, new_fd[3], ver, allowed;
+        int client_fd, new_fd[3], ver, allowed, window, packetmax;
         socklen_t addrlen;
         struct sockaddr_storage addr;
         struct confirm_ctx *cctx;
@@ -808,8 +834,7 @@ client_process_control(fd_set * readset)
                 return;
         }
 
-        cctx = xmalloc(sizeof(*cctx));
-        memset(cctx, 0, sizeof(*cctx));
+        cctx = xcalloc(1, sizeof(*cctx));
         cctx->want_tty = (flags & SSHMUX_FLAG_TTY) != 0;
         cctx->want_subsys = (flags & SSHMUX_FLAG_SUBSYS) != 0;
         cctx->want_x_fwd = (flags & SSHMUX_FLAG_X11_FWD) != 0;
@@ -824,7 +849,7 @@ client_process_control(fd_set * readset)
         env_len = MIN(env_len, 4096);
         debug3("%s: receiving %d env vars", __func__, env_len);
         if (env_len != 0) {
-                cctx->env = xmalloc(sizeof(*cctx->env) * (env_len + 1));
+                cctx->env = xcalloc(env_len + 1, sizeof(*cctx->env));
                 for (i = 0; i < env_len; i++)
                         cctx->env[i] = buffer_get_string(&m, &len);
                 cctx->env[i] = NULL;
@@ -832,6 +857,7 @@ client_process_control(fd_set * readset)
 
         debug2("%s: accepted tty %d, subsys %d, cmd %s", __func__,
             cctx->want_tty, cctx->want_subsys, cmd);
+        xfree(cmd);
 
         /* Gather fds from client */
         new_fd[0] = mm_receive_fd(client_fd);
@@ -874,9 +900,15 @@ client_process_control(fd_set * readset)
 
         set_nonblock(client_fd);
 
+        window = CHAN_SES_WINDOW_DEFAULT;
+        packetmax = CHAN_SES_PACKET_DEFAULT;
+        if (cctx->want_tty) {
+                window >>= 1;
+                packetmax >>= 1;
+        }
+        
         c = channel_new("session", SSH_CHANNEL_OPENING,
-            new_fd[0], new_fd[1], new_fd[2],
-            CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
+            new_fd[0], new_fd[1], new_fd[2], window, packetmax,
             CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
 
         /* XXX */
@@ -912,12 +944,16 @@ process_cmdline(void)
 
         if (*s == 'h' || *s == 'H' || *s == '?') {
                 logit("Commands:");
-                logit("      -Lport:host:hostport    Request local forward");
-                logit("      -Rport:host:hostport    Request remote forward");
-                logit("      -KRhostport             Cancel remote forward");
+                logit("      -L[bind_address:]port:host:hostport    "
+                    "Request local forward");
+                logit("      -R[bind_address:]port:host:hostport    "
+                    "Request remote forward");
+                logit("      -KR[bind_address:]port                 "
+                    "Cancel remote forward");
                 if (!options.permit_local_command)
                         goto out;
-                logit("      !args                   Execute local command");
+                logit("      !args                                  "
+                    "Execute local command");
                 goto out;
         }
 
@@ -978,9 +1014,12 @@ process_cmdline(void)
                                 goto out;
                         }
                 } else {
-                        channel_request_remote_forwarding(fwd.listen_host,
+                        if (channel_request_remote_forwarding(fwd.listen_host,
                             fwd.listen_port, fwd.connect_host,
-                            fwd.connect_port);
+                            fwd.connect_port) < 0) {
+                                logit("Port forwarding failed.");
+                                goto out;
+                        }
                 }
 
                 logit("Forwarding port.");
@@ -1172,7 +1211,7 @@ Supported escape sequences:\r\n\
 }
 
 static void
-client_process_input(fd_set * readset)
+client_process_input(fd_set *readset)
 {
         int len;
         char buf[8192];
@@ -1225,7 +1264,7 @@ client_process_input(fd_set * readset)
 }
 
 static void
-client_process_output(fd_set * writeset)
+client_process_output(fd_set *writeset)
 {
         int len;
         char buf[100];
@@ -1724,7 +1763,7 @@ client_request_agent(const char *request_type, int rchan)
                 error("Warning: this is probably a break-in attempt by a malicious server.");
                 return NULL;
         }
-        sock =  ssh_get_authentication_socket();
+        sock = ssh_get_authentication_socket();
         if (sock < 0)
                 return NULL;
         c = channel_new("authentication agent connection",
@@ -1869,10 +1908,10 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
 
                 channel_request_start(id, "pty-req", 0);
                 packet_put_cstring(term != NULL ? term : "");
-                packet_put_int(ws.ws_col);
-                packet_put_int(ws.ws_row);
-                packet_put_int(ws.ws_xpixel);
-                packet_put_int(ws.ws_ypixel);
+                packet_put_int((u_int)ws.ws_col);
+                packet_put_int((u_int)ws.ws_row);
+                packet_put_int((u_int)ws.ws_xpixel);
+                packet_put_int((u_int)ws.ws_ypixel);
                 tio = get_saved_tio();
                 tty_make_modes(-1, tiop != NULL ? tiop : &tio);
                 packet_send();