5 files changed, 14 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b6b203265..27a0b81e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,9 @@
    - deraadt@cvs.openbsd.org 2001/03/01 02:29:04
      [ssh.c]
      shorten usage by a line
+   - deraadt@cvs.openbsd.org 2001/03/01 02:45:10
+     [auth-rsa.c auth2.c deattack.c packet.c]
+     KNF
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4292,4 +4295,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.882 2001/03/05 06:45:21 mouring Exp $
+$Id: ChangeLog,v 1.883 2001/03/05 06:47:00 mouring Exp $
diff --git a/auth-rsa.c b/auth-rsa.c
index ee71655f3..30e5a54c4 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rsa.c,v 1.38 2001/01/21 19:05:42 markus Exp $");
+RCSID("$OpenBSD: auth-rsa.c,v 1.39 2001/03/01 02:45:10 deraadt Exp $");
 
 #include <openssl/rsa.h>
 #include <openssl/md5.h>
@@ -186,8 +186,8 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
                 }
                 if (fail) {
                         fclose(f);
-                        log("%s",buf);
-                        packet_send_debug("%s",buf);
+                        log("%s", buf);
+                        packet_send_debug("%s", buf);
                         restore_uid();
                         return 0;
                 }
diff --git a/auth2.c b/auth2.c
index 5d7de3a1c..e60bed10b 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.43 2001/02/22 21:59:44 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.44 2001/03/01 02:45:10 deraadt Exp $");
 
 #include <openssl/evp.h>
 
@@ -640,7 +640,7 @@ user_key_allowed(struct passwd *pw, Key *key)
                 }
                 if (fail) {
                         fclose(f);
-                        log("%s",buf);
+                        log("%s", buf);
                         restore_uid();
                         return 0;
                 }
diff --git a/deattack.c b/deattack.c
index 9b9babace..36023e0d3 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: deattack.c,v 1.12 2001/01/21 19:05:48 markus Exp $    */
+/*      $OpenBSD: deattack.c,v 1.13 2001/03/01 02:45:10 deraadt Exp $   */
 
 /*
  * Cryptographic attack detector for ssh - source code
@@ -44,7 +44,7 @@
 /* Hash function (Input keys are cipher results) */
 #define HASH(x)         GET_32BIT(x)
 
-#define CMP(a,b)        (memcmp(a, b, SSH_BLOCKSIZE))
+#define CMP(a, b)       (memcmp(a, b, SSH_BLOCKSIZE))
 
 
 void
diff --git a/packet.c b/packet.c
index a1a5d8a76..419b2f777 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.54 2001/02/28 21:27:47 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.55 2001/03/01 02:45:10 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -389,7 +389,7 @@ packet_start2(int type)
 void
 packet_start(int type)
 {
-        DBG(debug("packet_start[%d]",type));
+        DBG(debug("packet_start[%d]", type));
         if (use_ssh2_packet_format)
                 packet_start2(type);
         else
@@ -942,7 +942,7 @@ packet_read_poll2(int *payload_len_ptr)
         }
 
 #ifdef PACKET_DEBUG
-        fprintf(stderr, "read/plain[%d]:\r\n",type);
+        fprintf(stderr, "read/plain[%d]:\r\n", type);
         buffer_dump(&incoming_packet);
 #endif
         return (u_char)type;