1 files changed, 50 insertions, 6 deletions

diff --git a/sshconnect.c b/sshconnect.c
index a222233d0..3c888e36a 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -74,6 +74,13 @@ extern pid_t proxy_command_pid;
 #define INET6_ADDRSTRLEN 46
 #endif
 
+static sig_atomic_t banner_timedout;
+
+static void banner_alarm_catch (int signum)
+{
+        banner_timedout = 1;
+}
+
 static int show_other_keys(const char *, Key *);
 static void warn_changed_key(Key *);
 
@@ -157,7 +164,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
         xfree(command_string);
 
         /* Set the connection file descriptors. */
-        packet_set_connection(pout[0], pin[1]);
+        packet_set_connection(pout[0], pin[1], options.setuptimeout);
 
         /* Indicate OK return */
         return 0;
@@ -385,7 +392,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
                 error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
 
         /* Set the connection. */
-        packet_set_connection(sock, sock);
+        packet_set_connection(sock, sock, options.setuptimeout);
 
         return 0;
 }
@@ -403,16 +410,40 @@ ssh_exchange_identification(void)
         int connection_out = packet_get_connection_out();
         int minor1 = PROTOCOL_MINOR_1;
         u_int i, n;
+        struct sigaction sa, osa;
 
+        /* Read other side's version identification.
+         * If SetupTimeOut has been set, give up after the specified amount
+         * of time.
+         */
+        if (options.setuptimeout > 0) {
+                memset(&sa, 0, sizeof(sa));
+                sa.sa_handler = banner_alarm_catch;
+                /* throw away any pending alarms, since we'd block otherwise */
+                alarm(0);
+                sigaction(SIGALRM, &sa, &osa);
+                alarm(options.setuptimeout);
+        }
         /* Read other side's version identification. */
         for (n = 0;;) {
-                for (i = 0; i < sizeof(buf) - 1; i++) {
-                        size_t len = atomicio(read, connection_in, &buf[i], 1);
+                for (i = 0; i < sizeof(buf) - 1; ) {
+                        ssize_t len = read(connection_in, &buf[i], 1);
+                        if (banner_timedout)
+                                fatal("ssh_exchange_identification: Timeout waiting for version information.");
+                        if (len == 0)
+                                errno = EPIPE;
 
                         if (len != 1 && errno == EPIPE)
                                 fatal("ssh_exchange_identification: Connection closed by remote host");
-                        else if (len != 1)
+                        else if (len != 1) {
+#ifdef EWOULDBLOCK
+                                if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+#else
+                                if (errno == EINTR || errno == EAGAIN)
+#endif
+                                        continue;
                                 fatal("ssh_exchange_identification: read: %.100s", strerror(errno));
+                        }
                         if (buf[i] == '\r') {
                                 buf[i] = '\n';
                                 buf[i + 1] = 0;
@@ -422,8 +453,13 @@ ssh_exchange_identification(void)
                                 buf[i + 1] = 0;
                                 break;
                         }
+                        if (buf[i] == '\r') {
+                                buf[i] = '\n';
+                                buf[i + 1] = 0;         /**XXX wait for \n */
+                        }
                         if (++n > 65536)
                                 fatal("ssh_exchange_identification: No banner received");
+                        i++;
                 }
                 buf[sizeof(buf) - 1] = 0;
                 if (strncmp(buf, "SSH-", 4) == 0)
@@ -432,6 +468,14 @@ ssh_exchange_identification(void)
         }
         server_version_string = xstrdup(buf);
 
+        /* If SetupTimeOut has been set, unset the alarm now, and
+         * put the correct handler for SIGALRM back.
+         */
+        if (options.setuptimeout > 0) {
+                alarm(0);
+                sigaction(SIGALRM, &osa, NULL);
+        }
+
         /*
          * Check that the versions match.  In future this might accept
          * several versions and set appropriate flags to handle them.
@@ -487,7 +531,7 @@ ssh_exchange_identification(void)
         snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n",
             compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
             compat20 ? PROTOCOL_MINOR_2 : minor1,
-            SSH_VERSION);
+            SSH_RELEASE);
         if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf))
                 fatal("write: %.100s", strerror(errno));
         client_version_string = xstrdup(buf);