- OpenBSD CVS updates:

   - deraadt@cvs.openbsd.org 2000/06/17 09:58:46
     [channels.c]
     everyone says "nix it" (remove protocol 2 debugging message)
   - markus@cvs.openbsd.org  2000/06/17 13:24:34
     [sshconnect.c]
     allow extended server banners
   - markus@cvs.openbsd.org  2000/06/17 14:30:10
     [sshconnect.c]
     missing atomicio, typo
   - jakob@cvs.openbsd.org   2000/06/17 16:52:34
     [servconf.c servconf.h session.c sshd.8 sshd_config]
     add support for ssh v2 subsystems. ok markus@.
   - deraadt@cvs.openbsd.org 2000/06/17 18:57:48
     [readconf.c servconf.c]
     include = in WHITESPACE; markus ok
   - markus@cvs.openbsd.org  2000/06/17 19:09:10
     [auth2.c]
     implement bug compatibility with ssh-2.0.13 pubkey, server side
   - markus@cvs.openbsd.org  2000/06/17 21:00:28
     [compat.c]
     initial support for ssh.com's 2.2.0
   - markus@cvs.openbsd.org  2000/06/17 21:16:09
     [scp.c]
     typo
   - markus@cvs.openbsd.org  2000/06/17 22:05:02
     [auth-rsa.c auth2.c serverloop.c session.c auth-options.c auth-options.h]
     split auth-rsa option parsing into auth-options
     add options support to authorized_keys2
   - markus@cvs.openbsd.org  2000/06/17 22:42:54
     [session.c]
     typo

1 files changed, 20 insertions, 15 deletions

diff --git a/sshconnect.c b/sshconnect.c
index bf00159b3..835ca7b3a 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.74 2000/05/17 16:57:02 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.76 2000/06/17 20:30:10 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
@@ -314,23 +314,28 @@ ssh_exchange_identification()
         int connection_out = packet_get_connection_out();
 
         /* Read other side\'s version identification. */
-        for (i = 0; i < sizeof(buf) - 1; i++) {
-                int len = read(connection_in, &buf[i], 1);
-                if (len < 0)
-                        fatal("ssh_exchange_identification: read: %.100s", strerror(errno));
-                if (len != 1)
-                        fatal("ssh_exchange_identification: Connection closed by remote host");
-                if (buf[i] == '\r') {
-                        buf[i] = '\n';
-                        buf[i + 1] = 0;
-                        continue;               /**XXX wait for \n */
+        for (;;) {
+                for (i = 0; i < sizeof(buf) - 1; i++) {
+                        int len = atomicio(read, connection_in, &buf[i], 1);
+                        if (len < 0)
+                                fatal("ssh_exchange_identification: read: %.100s", strerror(errno));
+                        if (len != 1)
+                                fatal("ssh_exchange_identification: Connection closed by remote host");
+                        if (buf[i] == '\r') {
+                                buf[i] = '\n';
+                                buf[i + 1] = 0;
+                                continue;               /**XXX wait for \n */
+                        }
+                        if (buf[i] == '\n') {
+                                buf[i + 1] = 0;
+                                break;
+                        }
                 }
-                if (buf[i] == '\n') {
-                        buf[i + 1] = 0;
+                buf[sizeof(buf) - 1] = 0;
+                if (strncmp(buf, "SSH-", 4) == 0)
                         break;
-                }
+                debug("ssh_exchange_identification: %s", buf);
         }
-        buf[sizeof(buf) - 1] = 0;
         server_version_string = xstrdup(buf);
 
         /*