5 files changed, 13 insertions, 13 deletions

diff --git a/auth-skey.c b/auth-skey.c
index 25073dbae..cb43dba48 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-skey.c,v 1.26 2006/08/05 08:28:24 dtucker Exp $ */
+/* $OpenBSD: auth-skey.c,v 1.27 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -59,8 +59,8 @@ skey_query(void *ctx, char **name, char **infotxt,
             sizeof(challenge)) == -1)
                 return -1;
 
-        *name  = xstrdup("");
-        *infotxt  = xstrdup("");
+        *name = xstrdup("");
+        *infotxt = xstrdup("");
         *numprompts = 1;
         *prompts = xcalloc(*numprompts, sizeof(char *));
         *echo_on = xcalloc(*numprompts, sizeof(u_int));
diff --git a/clientloop.c b/clientloop.c
index 4c5108199..0b6fbe88d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.176 2006/10/11 12:38:03 markus Exp $ */
+/* $OpenBSD: clientloop.c,v 1.177 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1757,7 +1757,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",
diff --git a/kex.c b/kex.c
index bfc1c11f9..b2223c5ff 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.76 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kex.c,v 1.77 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -552,7 +552,7 @@ dump_digest(char *msg, u_char *digest, int len)
         u_int i;
 
         fprintf(stderr, "%s\n", msg);
-        for (i = 0; i< len; i++) {
+        for (i = 0; i < len; i++) {
                 fprintf(stderr, "%02x", digest[i]);
                 if (i%32 == 31)
                         fprintf(stderr, "\n");
diff --git a/session.c b/session.c
index 69153ad1e..4c97c4a7d 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.220 2006/10/09 23:36:11 djm Exp $ */
+/* $OpenBSD: session.c,v 1.221 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2027,7 +2027,7 @@ session_input_channel_req(Channel *c, const char *rtype)
                 } else if (strcmp(rtype, "exec") == 0) {
                         success = session_exec_req(s);
                 } else if (strcmp(rtype, "pty-req") == 0) {
-                        success =  session_pty_req(s);
+                        success = session_pty_req(s);
                 } else if (strcmp(rtype, "x11-req") == 0) {
                         success = session_x11_req(s);
                 } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) {
@@ -2152,7 +2152,7 @@ session_close_single_x11(int id, void *arg)
 
         debug3("session_close_single_x11: channel %d", id);
         channel_cancel_cleanup(id);
-        if ((s  = session_by_x11_channel(id)) == NULL)
+        if ((s = session_by_x11_channel(id)) == NULL)
                 fatal("session_close_single_x11: no x11 channel %d", id);
         for (i = 0; s->x11_chanids[i] != -1; i++) {
                 debug("session_close_single_x11: session %d: "
diff --git a/ssh-keygen.c b/ssh-keygen.c
index ed3cdb3ed..04a9b939a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.159 2007/01/12 20:20:41 jmc Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.160 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -241,7 +241,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         buffer_init(&b);
         buffer_append(&b, blob, blen);
 
-        magic  = buffer_get_int(&b);
+        magic = buffer_get_int(&b);
         if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {
                 error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC);
                 buffer_free(&b);
@@ -284,7 +284,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
                 buffer_get_bignum_bits(&b, key->dsa->priv_key);
                 break;
         case KEY_RSA:
-                e  = buffer_get_char(&b);
+                e = buffer_get_char(&b);
                 debug("e %lx", e);
                 if (e < 30) {
                         e <<= 8;