22 files changed, 128 insertions, 122 deletions

diff --git a/ChangeLog b/ChangeLog
index a36c1dd22..e09a0fc83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
    ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
    openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
    diff vs OpenBSD; ok mouring@, tested by tim@ too.
+ - (dtucker) OpenBSD CVS Sync
+   - deraadt@cvs.openbsd.org 2004/07/11 17:48:47
+     [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
+     readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
+     session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
+     sshd.c ttymodes.h]
+     spaces
 
 20040711
  - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
@@ -1509,4 +1516,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3474 2004/07/17 04:07:42 dtucker Exp $
+$Id: ChangeLog,v 1.3475 2004/07/17 06:12:08 dtucker Exp $
diff --git a/channels.c b/channels.c
index a72d9b93d..cf46ce09f 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.207 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: channels.c,v 1.208 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -737,7 +737,7 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset)
                         FD_SET(c->efd, readset);
         }
         /* XXX: What about efd? races? */
-        if (compat20 && c->ctl_fd != -1 && 
+        if (compat20 && c->ctl_fd != -1 &&
             c->istate == CHAN_INPUT_OPEN && c->ostate == CHAN_OUTPUT_OPEN)
                 FD_SET(c->ctl_fd, readset);
 }
@@ -2277,7 +2277,7 @@ channel_cancel_rport_listener(const char *host, u_short port)
 
                 if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER &&
                     strncmp(c->path, host, sizeof(c->path)) == 0 &&
-                    c->listening_port == port) {
+                    c->listening_port == port) {
                         debug2("%s: close clannel %d", __func__, i);
                         channel_free(c);
                         found = 1;
@@ -2364,10 +2364,9 @@ channel_request_remote_forwarding(u_short listen_port,
 }
 
 /*
- * Request cancellation of remote forwarding of connection host:port from 
+ * Request cancellation of remote forwarding of connection host:port from
  * local side.
  */
-
 void
 channel_request_rforward_cancel(u_short port)
 {
@@ -2378,7 +2377,7 @@ channel_request_rforward_cancel(u_short port)
                 return;
 
         for (i = 0; i < num_permitted_opens; i++) {
-                if (permitted_opens[i].host_to_connect != NULL && 
+                if (permitted_opens[i].host_to_connect != NULL &&
                     permitted_opens[i].listen_port == port)
                         break;
         }
diff --git a/cipher.c b/cipher.c
index 64bd744b8..93f96be6d 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.69 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.70 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -76,19 +76,19 @@ struct Cipher {
         u_int   key_len;
         const EVP_CIPHER        *(*evptype)(void);
 } ciphers[] = {
-        { "none",               SSH_CIPHER_NONE, 8, 0, EVP_enc_null },
-        { "des",                SSH_CIPHER_DES, 8, 8, EVP_des_cbc },
-        { "3des",               SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des },
-        { "blowfish",           SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf },
-
-        { "3des-cbc",           SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc },
-        { "blowfish-cbc",       SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc },
-        { "cast128-cbc",        SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc },
-        { "arcfour",            SSH_CIPHER_SSH2, 8, 16, EVP_rc4 },
+        { "none",               SSH_CIPHER_NONE, 8, 0, EVP_enc_null },
+        { "des",                SSH_CIPHER_DES, 8, 8, EVP_des_cbc },
+        { "3des",               SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des },
+        { "blowfish",           SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf },
+
+        { "3des-cbc",           SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc },
+        { "blowfish-cbc",       SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc },
+        { "cast128-cbc",        SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc },
+        { "arcfour",            SSH_CIPHER_SSH2, 8, 16, EVP_rc4 },
 #if OPENSSL_VERSION_NUMBER < 0x00907000L
-        { "aes128-cbc",         SSH_CIPHER_SSH2, 16, 16, evp_rijndael },
-        { "aes192-cbc",         SSH_CIPHER_SSH2, 16, 24, evp_rijndael },
-        { "aes256-cbc",         SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
+        { "aes128-cbc",         SSH_CIPHER_SSH2, 16, 16, evp_rijndael },
+        { "aes192-cbc",         SSH_CIPHER_SSH2, 16, 24, evp_rijndael },
+        { "aes256-cbc",         SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
         { "rijndael-cbc@lysator.liu.se",
                                 SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
 #else
@@ -99,9 +99,9 @@ struct Cipher {
                                 SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc },
 #endif
 #if OPENSSL_VERSION_NUMBER >= 0x00905000L
-        { "aes128-ctr",         SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr },
-        { "aes192-ctr",         SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr },
-        { "aes256-ctr",         SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },
+        { "aes128-ctr",         SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr },
+        { "aes192-ctr",         SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr },
+        { "aes256-ctr",         SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },
 #endif
 #if defined(EVP_CTRL_SET_ACSS_MODE)
         { "acss@openssh.org",   SSH_CIPHER_SSH2, 16, 5, EVP_acss },
diff --git a/clientloop.c b/clientloop.c
index 79aabbe06..def4d8a7b 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.128 2004/06/18 11:11:54 djm Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.129 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -402,7 +402,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
 
         if (options.server_alive_interval == 0 || !compat20)
                 tvp = NULL;
-        else {  
+        else {
                 tv.tv_sec = options.server_alive_interval;
                 tv.tv_usec = 0;
                 tvp = &tv;
@@ -517,7 +517,7 @@ client_subsystem_reply(int type, u_int32_t seq, void *ctxt)
 {
         int id;
         Channel *c;
-        
+
         id = packet_get_int();
         packet_check_eom();
 
@@ -540,13 +540,13 @@ client_extra_session2_setup(int id, void *arg)
         struct confirm_ctx *cctx = arg;
         Channel *c;
         int i;
-        
+
         if (cctx == NULL)
                 fatal("%s: cctx == NULL", __func__);
         if ((c = channel_lookup(id)) == NULL)
                 fatal("%s: no channel for id %d", __func__, id);
 
-        client_session2_setup(id, cctx->want_tty, cctx->want_subsys, 
+        client_session2_setup(id, cctx->want_tty, cctx->want_subsys,
             cctx->term, &cctx->tio, c->rfd, &cctx->cmd, cctx->env,
             client_subsystem_reply);
 
@@ -557,7 +557,7 @@ client_extra_session2_setup(int id, void *arg)
                 for (i = 0; cctx->env[i] != NULL; i++)
                         xfree(cctx->env[i]);
                 xfree(cctx->env);
-        }                       
+        }
         xfree(cctx);
 }
 
@@ -614,7 +614,7 @@ client_process_control(fd_set * readset)
                          * Accept empty responses and responses consisting
                          * of the word "yes" as affirmative.
                          */
-                        if (*p == '\0' || *p == '\n' || 
+                        if (*p == '\0' || *p == '\n' ||
                             strcasecmp(p, "yes") == 0)
                                 allowed = 1;
                         xfree(p);
@@ -714,7 +714,7 @@ client_process_control(fd_set * readset)
 
         set_nonblock(client_fd);
 
-        c = channel_new("session", SSH_CHANNEL_OPENING, 
+        c = channel_new("session", SSH_CHANNEL_OPENING,
             new_fd[0], new_fd[1], new_fd[2],
             CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
             CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
@@ -1673,7 +1673,7 @@ client_input_global_request(int type, u_int32_t seq, void *ctxt)
 }
 
 void
-client_session2_setup(int id, int want_tty, int want_subsystem, 
+client_session2_setup(int id, int want_tty, int want_subsystem,
     const char *term, struct termios *tiop, int in_fd, Buffer *cmd, char **env,
     dispatch_fn *subsys_repl)
 {
diff --git a/clientloop.h b/clientloop.h
index c34d6674d..9992d5938 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: clientloop.h,v 1.10 2004/06/17 14:52:48 djm Exp $     */
+/*      $OpenBSD: clientloop.h,v 1.11 2004/07/11 17:48:47 deraadt Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,5 +38,5 @@
 /* Client side main loop for the interactive session. */
 int      client_loop(int, int, int);
 void     client_global_request_reply_fwd(int, u_int32_t, void *);
-void     client_session2_setup(int, int, int, const char *, struct termios *, 
+void     client_session2_setup(int, int, int, const char *, struct termios *,
             int, Buffer *, char **, dispatch_fn *);
diff --git a/compat.h b/compat.h
index efa0f081e..5efb5c29e 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $      */
+/*      $OpenBSD: compat.h,v 1.38 2004/07/11 17:48:47 deraadt Exp $     */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,7 +27,7 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
-#define SSH_PROTO_UNKNOWN       0x00
+#define SSH_PROTO_UNKNOWN       0x00
 #define SSH_PROTO_1             0x01
 #define SSH_PROTO_1_PREFERRED   0x02
 #define SSH_PROTO_2             0x04
diff --git a/moduli.c b/moduli.c
index c8769c0aa..581b03503 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.8 2004/05/21 08:43:03 markus Exp $ */
+/* $OpenBSD: moduli.c,v 1.9 2004/07/11 17:48:47 deraadt Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -48,68 +48,68 @@
  */
 
 /* need line long enough for largest moduli plus headers */
-#define QLINESIZE               (100+8192)
+#define QLINESIZE               (100+8192)
 
 /* Type: decimal.
  * Specifies the internal structure of the prime modulus.
  */
-#define QTYPE_UNKNOWN           (0)
-#define QTYPE_UNSTRUCTURED      (1)
-#define QTYPE_SAFE              (2)
-#define QTYPE_SCHNOOR           (3)
-#define QTYPE_SOPHIE_GERMAIN    (4)
-#define QTYPE_STRONG            (5)
+#define QTYPE_UNKNOWN           (0)
+#define QTYPE_UNSTRUCTURED      (1)
+#define QTYPE_SAFE              (2)
+#define QTYPE_SCHNOOR           (3)
+#define QTYPE_SOPHIE_GERMAIN    (4)
+#define QTYPE_STRONG            (5)
 
 /* Tests: decimal (bit field).
  * Specifies the methods used in checking for primality.
  * Usually, more than one test is used.
  */
-#define QTEST_UNTESTED          (0x00)
-#define QTEST_COMPOSITE         (0x01)
-#define QTEST_SIEVE             (0x02)
-#define QTEST_MILLER_RABIN      (0x04)
-#define QTEST_JACOBI            (0x08)
-#define QTEST_ELLIPTIC          (0x10)
+#define QTEST_UNTESTED          (0x00)
+#define QTEST_COMPOSITE         (0x01)
+#define QTEST_SIEVE             (0x02)
+#define QTEST_MILLER_RABIN      (0x04)
+#define QTEST_JACOBI            (0x08)
+#define QTEST_ELLIPTIC          (0x10)
 
 /*
  * Size: decimal.
  * Specifies the number of the most significant bit (0 to M).
  * WARNING: internally, usually 1 to N.
  */
-#define QSIZE_MINIMUM           (511)
+#define QSIZE_MINIMUM           (511)
 
 /*
  * Prime sieving defines
  */
 
 /* Constant: assuming 8 bit bytes and 32 bit words */
-#define SHIFT_BIT       (3)
-#define SHIFT_BYTE      (2)
-#define SHIFT_WORD      (SHIFT_BIT+SHIFT_BYTE)
-#define SHIFT_MEGABYTE  (20)
-#define SHIFT_MEGAWORD  (SHIFT_MEGABYTE-SHIFT_BYTE)
+#define SHIFT_BIT       (3)
+#define SHIFT_BYTE      (2)
+#define SHIFT_WORD      (SHIFT_BIT+SHIFT_BYTE)
+#define SHIFT_MEGABYTE  (20)
+#define SHIFT_MEGAWORD  (SHIFT_MEGABYTE-SHIFT_BYTE)
 
 /*
  * Using virtual memory can cause thrashing.  This should be the largest
  * number that is supported without a large amount of disk activity --
  * that would increase the run time from hours to days or weeks!
  */
-#define LARGE_MINIMUM   (8UL)   /* megabytes */
+#define LARGE_MINIMUM   (8UL)   /* megabytes */
 
 /*
  * Do not increase this number beyond the unsigned integer bit size.
  * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits).
  */
-#define LARGE_MAXIMUM   (127UL) /* megabytes */
+#define LARGE_MAXIMUM   (127UL) /* megabytes */
 
 /*
  * Constant: when used with 32-bit integers, the largest sieve prime
  * has to be less than 2**32.
  */
-#define SMALL_MAXIMUM   (0xffffffffUL)
+#define SMALL_MAXIMUM   (0xffffffffUL)
 
 /* Constant: can sieve all primes less than 2**32, as 65537**2 > 2**32-1. */
-#define TINY_NUMBER     (1UL<<16)
+#define TINY_NUMBER     (1UL<<16)
 
 /* Ensure enough bit space for testing 2*q. */
 #define TEST_MAXIMUM    (1UL<<16)
diff --git a/nchan.c b/nchan.c
index ecf59c5db..aee3f37b0 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.50 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.50 2004/06/21 17:36:31 avsm Exp $");
  * tear down of channels:
  *
  * 1.3: strict request-ack-protocol:
- *      CLOSE   ->
- *              <-  CLOSE_CONFIRM
+ *      CLOSE   ->
+ *              <-  CLOSE_CONFIRM
  *
  * 1.5: uses variations of:
- *      IEOF    ->
- *              <-  OCLOSE
- *              <-  IEOF
- *      OCLOSE  ->
- *      i.e. both sides have to close the channel
+ *      IEOF    ->
+ *              <-  OCLOSE
+ *              <-  IEOF
+ *      OCLOSE  ->
+ *      i.e. both sides have to close the channel
  *
  * 2.0: the EOF messages are optional
  *
diff --git a/pathnames.h b/pathnames.h
index 53208cf58..cf42625a4 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pathnames.h,v 1.14 2004/01/30 09:48:57 markus Exp $   */
+/*      $OpenBSD: pathnames.h,v 1.15 2004/07/11 17:48:47 deraadt Exp $  */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -122,7 +122,7 @@
 
 /* Location of ssh-keysign for hostbased authentication */
 #ifndef _PATH_SSH_KEY_SIGN
-#define _PATH_SSH_KEY_SIGN            "/usr/libexec/ssh-keysign"
+#define _PATH_SSH_KEY_SIGN              "/usr/libexec/ssh-keysign"
 #endif
 
 /* xauth for X11 forwarding */
diff --git a/progressmeter.c b/progressmeter.c
index 629a536b2..93f5a3e62 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.21 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -48,15 +48,15 @@ void refresh_progress_meter(void);
 /* signal handler for updating the progress meter */
 static void update_progress_meter(int);
 
-static time_t start;            /* start progress */
-static time_t last_update;      /* last progress update */
-static char *file;              /* name of the file being transferred */
-static off_t end_pos;           /* ending position of transfer */
-static off_t cur_pos;           /* transfer position as of last refresh */
+static time_t start;            /* start progress */
+static time_t last_update;      /* last progress update */
+static char *file;              /* name of the file being transferred */
+static off_t end_pos;           /* ending position of transfer */
+static off_t cur_pos;           /* transfer position as of last refresh */
 static volatile off_t *counter; /* progress counter */
-static long stalled;            /* how long we have been stalled */
-static int bytes_per_second;    /* current speed in bytes per second */
-static int win_size;            /* terminal window size */
+static long stalled;            /* how long we have been stalled */
+static int bytes_per_second;    /* current speed in bytes per second */
+static int win_size;            /* terminal window size */
 
 /* units for format_size */
 static const char unit[] = " KMGT";
diff --git a/readconf.c b/readconf.c
index 429f69129..a4fe1fe02 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.133 2004/06/17 15:10:14 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.134 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -804,7 +804,7 @@ parse_int:
  */
 
 int
-read_config_file(const char *filename, const char *host, Options *options, 
+read_config_file(const char *filename, const char *host, Options *options,
     int checkperm)
 {
         FILE *f;
@@ -818,7 +818,7 @@ read_config_file(const char *filename, const char *host, Options *options,
 
         if (checkperm) {
                 struct stat sb;
-                
+
                 if (fstat(fileno(f), &sb) == -1)
                         fatal("fstat %s: %s", filename, strerror(errno));
                 if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
diff --git a/readconf.h b/readconf.h
index 5e504bece..ded422585 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readconf.h,v 1.63 2004/06/13 15:03:02 djm Exp $       */
+/*      $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -103,7 +103,7 @@ typedef struct {
         int     rekey_limit;
         int     no_host_authentication_for_localhost;
         int     identities_only;
-        int     server_alive_interval; 
+        int     server_alive_interval;
         int     server_alive_count_max;
 
         int     num_send_env;
diff --git a/servconf.c b/servconf.c
index ea67f6288..02fae0fbe 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.134 2004/06/24 19:30:54 djm Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.135 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -956,7 +956,7 @@ load_server_config(const char *filename, Buffer *conf)
         while (fgets(line, sizeof(line), f)) {
                 /*
                  * Trim out comments and strip whitespace
-                 * NB - preserve newlines, they are needed to reproduce 
+                 * NB - preserve newlines, they are needed to reproduce
                  * line numbers later for error messages
                  */
                 if ((cp = strchr(line, '#')) != NULL)
diff --git a/session.c b/session.c
index a3a7ee784..7c8fe5faf 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.177 2004/06/30 08:36:59 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.178 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1001,7 +1001,7 @@ do_setup_env(Session *s, const char *shell)
         if (!options.use_login) {
                 /* Set basic environment. */
                 for (i = 0; i < s->num_env; i++)
-                        child_set_env(&env, &envsize, s->env[i].name, 
+                        child_set_env(&env, &envsize, s->env[i].name,
                             s->env[i].val);
 
                 child_set_env(&env, &envsize, "USER", pw->pw_name);
@@ -1320,7 +1320,7 @@ do_pwchange(Session *s)
 {
         fprintf(stderr, "WARNING: Your password has expired.\n");
         if (s->ttyfd != -1) {
-                fprintf(stderr,
+                fprintf(stderr,
                     "You must change your password now and login again!\n");
                 execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
                 perror("passwd");
diff --git a/sftp-client.c b/sftp-client.c
index 88276cd4a..0ffacbccc 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.50 2004/06/03 12:22:20 pedro Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -821,7 +821,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
                 u_int len;
 
                 /*
-                 * Simulate EOF on interrupt: stop sending new requests and 
+                 * Simulate EOF on interrupt: stop sending new requests and
                  * allow outstanding requests to drain gracefully
                  */
                 if (interrupted) {
@@ -1053,9 +1053,9 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                 int len;
 
                 /*
-                 * Can't use atomicio here because it returns 0 on EOF, 
+                 * Can't use atomicio here because it returns 0 on EOF,
                  * thus losing the last block of the file.
-                 * Simulate an EOF on interrupt, allowing ACKs from the 
+                 * Simulate an EOF on interrupt, allowing ACKs from the
                  * server to drain.
                  */
                 if (interrupted)
diff --git a/sftp.c b/sftp.c
index 4002304ec..f01c9194c 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.55 2004/06/25 23:21:38 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.56 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -1328,8 +1328,8 @@ connect_to_server(char *path, char **args, int *in, int *out)
 
                 /*
                  * The underlying ssh is in the same process group, so we must
-                 * ignore SIGINT if we want to gracefully abort commands, 
-                 * otherwise the signal will make it to the ssh process and 
+                 * ignore SIGINT if we want to gracefully abort commands,
+                 * otherwise the signal will make it to the ssh process and
                  * kill it too
                  */
                 signal(SIGINT, SIG_IGN);
@@ -1415,7 +1415,7 @@ main(int argc, char **argv)
                                 fatal("Batch file already specified.");
 
                         /* Allow "-" as stdin */
-                        if (strcmp(optarg, "-") != 0 && 
+                        if (strcmp(optarg, "-") != 0 &&
                            (infile = fopen(optarg, "r")) == NULL)
                                 fatal("%s (%s).", strerror(errno), optarg);
                         showprogress = 0;
diff --git a/ssh-agent.1 b/ssh-agent.1
index cfefd34e9..226804e5f 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.40 2004/05/13 02:47:50 dtucker Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.41 2004/07/11 17:48:47 deraadt Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -148,7 +148,7 @@ for Bourne-type shells such as
 or
 .Xr ksh 1
 and
-.Cm eval `ssh-agent -c` 
+.Cm eval `ssh-agent -c`
 for
 .Xr csh 1
 and derivatives.
diff --git a/ssh-keygen.c b/ssh-keygen.c
index e8e579b5d..d39e7d881 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.116 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.117 2004/07/11 17:48:47 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -895,7 +895,7 @@ main(int ac, char **av)
                         if (log_level == SYSLOG_LEVEL_INFO)
                                 log_level = SYSLOG_LEVEL_DEBUG1;
                         else {
-                                if (log_level >= SYSLOG_LEVEL_DEBUG1 && 
+                                if (log_level >= SYSLOG_LEVEL_DEBUG1 &&
                                     log_level < SYSLOG_LEVEL_DEBUG3)
                                         log_level++;
                         }
diff --git a/ssh.c b/ssh.c
index f0c284df0..6dff591f1 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -551,7 +551,7 @@ again:
                 (void)read_config_file(buf, host, &options, 1);
 
                 /* Read systemwide configuration file after use config. */
-                (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, 
+                (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
                     &options, 0);
         }
 
@@ -1250,7 +1250,7 @@ control_client(const char *path)
         Buffer m;
         char *cp;
         extern char **environ;
-        
+
         memset(&addr, '\0', sizeof(addr));
         addr.sun_family = AF_UNIX;
         addr_len = offsetof(struct sockaddr_un, sun_path) +
@@ -1291,13 +1291,13 @@ control_client(const char *path)
 
         if (options.num_send_env == 0 || environ == NULL) {
                 buffer_put_int(&m, 0);
-        } else {        
+        } else {
                 /* Pass environment */
                 num_env = 0;
                 for (i = 0; environ[i] != NULL; i++)
                         if (env_permitted(environ[i]))
                                 num_env++; /* Count */
-                        
+
                 buffer_put_int(&m, num_env);
 
                 for (i = 0; environ[i] != NULL && num_env >= 0; i++)
diff --git a/ssh1.h b/ssh1.h
index 98d1dc930..cc7fbc8b0 100644
--- a/ssh1.h
+++ b/ssh1.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */
+/*      $OpenBSD: ssh1.h,v 1.4 2004/07/11 17:48:47 deraadt Exp $        */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -29,8 +29,8 @@
 #define SSH_SMSG_AUTH_RSA_CHALLENGE             7       /* int (BIGNUM) */
 #define SSH_CMSG_AUTH_RSA_RESPONSE              8       /* int (BIGNUM) */
 #define SSH_CMSG_AUTH_PASSWORD                  9       /* pass (string) */
-#define SSH_CMSG_REQUEST_PTY                    10      /* TERM, tty modes */
-#define SSH_CMSG_WINDOW_SIZE                    11      /* row,col,xpix,ypix */
+#define SSH_CMSG_REQUEST_PTY                    10      /* TERM, tty modes */
+#define SSH_CMSG_WINDOW_SIZE                    11      /* row,col,xpix,ypix */
 #define SSH_CMSG_EXEC_SHELL                     12      /* */
 #define SSH_CMSG_EXEC_CMD                       13      /* cmd (string) */
 #define SSH_SMSG_SUCCESS                        14      /* */
@@ -45,7 +45,7 @@
 #define SSH_MSG_CHANNEL_DATA                    23      /* ch,data (int,str) */
 #define SSH_MSG_CHANNEL_CLOSE                   24      /* channel (int) */
 #define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION      25      /* channel (int) */
-/*      SSH_CMSG_X11_REQUEST_FORWARDING         26         OBSOLETE */
+/*      SSH_CMSG_X11_REQUEST_FORWARDING         26         OBSOLETE */
 #define SSH_SMSG_X11_OPEN                       27      /* channel (int) */
 #define SSH_CMSG_PORT_FORWARD_REQUEST           28      /* p,host,hp (i,s,i) */
 #define SSH_MSG_PORT_OPEN                       29      /* ch,h,p (i,s,i) */
diff --git a/sshd.c b/sshd.c
index 6df8f252a..ac62cb506 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.297 2004/06/26 20:07:16 avsm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.298 2004/07/11 17:48:47 deraadt Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -803,7 +803,7 @@ send_rexec_state(int fd, Buffer *conf)
         buffer_init(&m);
         buffer_put_cstring(&m, buffer_ptr(conf));
 
-        if (sensitive_data.server_key != NULL && 
+        if (sensitive_data.server_key != NULL &&
             sensitive_data.server_key->type == KEY_RSA1) {
                 buffer_put_int(&m, 1);
                 buffer_put_bignum(&m, sensitive_data.server_key->rsa->e);
@@ -1896,7 +1896,7 @@ do_ssh1_kex(void)
                             session_key + sizeof(session_key) - len);
 
                         derive_ssh1_session_id(
-                            sensitive_data.ssh1_host_key->rsa->n, 
+                            sensitive_data.ssh1_host_key->rsa->n,
                             sensitive_data.server_key->rsa->n,
                             cookie, session_id);
                         /*
diff --git a/ttymodes.h b/ttymodes.h
index 7de4b8362..481282cd7 100644
--- a/ttymodes.h
+++ b/ttymodes.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ttymodes.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $   */
+/*      $OpenBSD: ttymodes.h,v 1.13 2004/07/11 17:48:47 deraadt Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -113,17 +113,17 @@ TTYCHAR(VDISCARD, 18)
 /* name, field, op */
 TTYMODE(IGNPAR, c_iflag, 30)
 TTYMODE(PARMRK, c_iflag, 31)
-TTYMODE(INPCK,  c_iflag, 32)
+TTYMODE(INPCK,  c_iflag, 32)
 TTYMODE(ISTRIP, c_iflag, 33)
-TTYMODE(INLCR,  c_iflag, 34)
-TTYMODE(IGNCR,  c_iflag, 35)
-TTYMODE(ICRNL,  c_iflag, 36)
+TTYMODE(INLCR,  c_iflag, 34)
+TTYMODE(IGNCR,  c_iflag, 35)
+TTYMODE(ICRNL,  c_iflag, 36)
 #if defined(IUCLC)
-TTYMODE(IUCLC,  c_iflag, 37)
+TTYMODE(IUCLC,  c_iflag, 37)
 #endif
-TTYMODE(IXON,   c_iflag, 38)
-TTYMODE(IXANY,  c_iflag, 39)
-TTYMODE(IXOFF,  c_iflag, 40)
+TTYMODE(IXON,   c_iflag, 38)
+TTYMODE(IXANY,  c_iflag, 39)
+TTYMODE(IXOFF,  c_iflag, 40)
 #ifdef IMAXBEL
 TTYMODE(IMAXBEL,c_iflag, 41)
 #endif /* IMAXBEL */