diff --git a/ChangeLog b/ChangeLog
index d46f02d2b..08b382213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20050717
+- OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2005/07/16 01:35:24
+     [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c]
+     [sshconnect.c]
+     spacing
+
 20050716
  - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
    socketpair stays open on in both the monitor and PAM process.  Patch from
@@ -2830,4 +2837,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.3846 2005/07/16 01:33:06 dtucker Exp $
+$Id: ChangeLog,v 1.3847 2005/07/17 07:02:09 djm Exp $
diff --git a/auth1.c b/auth1.c
index 0f6be8201..ff937f80f 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.61 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -179,7 +179,7 @@ static int
 auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen)
 {
 	char *challenge;
-	
+
 	if ((challenge = get_challenge(authctxt)) == NULL)
 		return (0);
 
diff --git a/channels.c b/channels.c
index a7c69a066..b7ff85007 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.220 2005/07/04 14:04:11 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.221 2005/07/16 01:35:24 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -2986,7 +2986,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp,
 		/* Save protocol name. */
 		x11_saved_proto = xstrdup(proto);
 		/*
-		 * Extract real authentication data and generate fake data 
+		 * Extract real authentication data and generate fake data
 		 * of the same length.
 		 */
 		x11_saved_data = xmalloc(data_len);
diff --git a/cipher.c b/cipher.c
index fc1e2ae1c..0dddf270a 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.76 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.77 2005/07/16 01:35:24 djm Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -249,7 +249,7 @@ cipher_init(CipherContext *cc, Cipher *cipher,
 		    cipher->name);
 #endif
 
-	if (cipher->discard_len > 0) {		
+	if (cipher->discard_len > 0) {
 		junk = xmalloc(cipher->discard_len);
 		discard = xmalloc(cipher->discard_len);
 		if (EVP_Cipher(&cc->evp, discard, junk,
diff --git a/clientloop.c b/clientloop.c
index 9611a5e3e..47f3c7ecd 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.140 2005/07/04 00:58:43 djm Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.141 2005/07/16 01:35:24 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -642,7 +642,7 @@ client_extra_session2_setup(int id, void *arg)
 	if ((c = channel_lookup(id)) == NULL)
 		fatal("%s: no channel for id %d", __func__, id);
 
-	display = getenv("DISPLAY");	
+	display = getenv("DISPLAY");
 	if (cctx->want_x_fwd && options.forward_x11 && display != NULL) {
 		char *proto, *data;
 		/* Get reasonable local authentication information. */
diff --git a/kex.c b/kex.c
index 8736aa286..32c6d03ea 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.61 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: kex.c,v 1.62 2005/07/16 01:35:24 djm Exp $");
 
 #include <openssl/crypto.h>
 
@@ -411,7 +411,7 @@ derive_key(Kex *kex, int id, u_int need, u_char *hash, BIGNUM *shared_secret)
 	u_int have;
 	int mdsz = EVP_MD_size(evp_md);
 	u_char *digest;
-	
+
 	if (mdsz < 0)
 		fatal("derive_key: mdsz < 0");
 	digest = xmalloc(roundup(need, mdsz));
diff --git a/session.c b/session.c
index a1dc6835a..13c3b001f 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.182 2005/06/17 02:44:33 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.183 2005/07/16 01:35:24 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -196,11 +196,11 @@ auth_input_request_forwarding(struct passwd * pw)
 static void
 display_loginmsg(void)
 {
-        if (buffer_len(&loginmsg) > 0) {
-                buffer_append(&loginmsg, "\0", 1);
-                printf("%s", (char *)buffer_ptr(&loginmsg));
-                buffer_clear(&loginmsg);
-        }
+	if (buffer_len(&loginmsg) > 0) {
+		buffer_append(&loginmsg, "\0", 1);
+		printf("%s", (char *)buffer_ptr(&loginmsg));
+		buffer_clear(&loginmsg);
+	}
 }
 
 void
diff --git a/ssh.c b/ssh.c
index 43d97abcc..cabc538e3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.247 2005/07/04 00:58:43 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.248 2005/07/16 01:35:24 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -790,8 +790,8 @@ ssh_init_forwarding(void)
 	for (i = 0; i < options.num_remote_forwards; i++) {
 		debug("Remote connections from %.200s:%d forwarded to "
 		    "local address %.200s:%d",
-		    (options.remote_forwards[i].listen_host == NULL) ? 
-		    (options.gateway_ports ? "*" : "LOCALHOST") : 
+		    (options.remote_forwards[i].listen_host == NULL) ?
+		    (options.gateway_ports ? "*" : "LOCALHOST") :
 		    options.remote_forwards[i].listen_host,
 		    options.remote_forwards[i].listen_port,
 		    options.remote_forwards[i].connect_host,
@@ -1037,7 +1037,7 @@ ssh_session2_setup(int id, void *arg)
 	const char *display;
 	int interactive = tty_flag;
 
-	display = getenv("DISPLAY");	
+	display = getenv("DISPLAY");
 	if (options.forward_x11 && display != NULL) {
 		char *proto, *data;
 		/* Get reasonable local authentication information. */
@@ -1253,7 +1253,7 @@ control_client(const char *path)
  		close(sock);
  		return;
  	}
- 
+
  	if (stdin_null_flag) {
  		if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
  			fatal("open(/dev/null): %s", strerror(errno));
@@ -1262,7 +1262,7 @@ control_client(const char *path)
  		if (fd > STDERR_FILENO)
  			close(fd);
  	}
-  
+
 	term = getenv("TERM");
 
 	flags = 0;
diff --git a/sshconnect.c b/sshconnect.c
index 92f0f3800..84f287145 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.166 2005/06/17 22:53:47 djm Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.167 2005/07/16 01:35:24 djm Exp $");
 
 #include <openssl/bn.h>
 
@@ -404,7 +404,7 @@ ssh_exchange_identification(void)
 		for (i = 0; i < sizeof(buf) - 1; i++) {
 			size_t len = atomicio(read, connection_in, &buf[i], 1);
 
-			if (len != 1 && errno == EPIPE) 
+			if (len != 1 && errno == EPIPE)
 				fatal("ssh_exchange_identification: Connection closed by remote host");
 			else if (len != 1)
 				fatal("ssh_exchange_identification: read: %.100s", strerror(errno));