- itojun@cvs.openbsd.org 2002/10/16 14:31:48

[openssh.git] / deattack.c

diff --git a/deattack.c b/deattack.c
index 44220491d8c33e2ddb2f29638748dc43cccb64f0..0442501e7a17b6ddf4c6f7ae15770c8aa29129fc 100644 (file)
--- a/deattack.c
+++ b/deattack.c
@@ -1,5 +1,3 @@
-/*     $OpenBSD: deattack.c,v 1.15 2001/11/19 19:02:16 mpech Exp $     */
-
 /*
  * Cryptographic attack detector for ssh - source code
  *
@@ -20,11 +18,14 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: deattack.c,v 1.18 2002/03/04 17:27:39 stevesk Exp $");
+
 #include "deattack.h"
 #include "log.h"
 #include "crc32.h"
 #include "getput.h"
 #include "xmalloc.h"
+#include "deattack.h"
 
 /* SSH Constants */
 #define SSH_MAXBLOCKS  (32 * 1024)
@@ -36,7 +37,7 @@
 #define HASH_FACTOR(x) ((x)*3/2)
 #define HASH_UNUSEDCHAR        (0xff)
 #define HASH_UNUSED    (0xffff)
-#define HASH_IV        (0xfffe)
+#define HASH_IV                (0xfffe)
 
 #define HASH_MINBLOCKS (7*SSH_BLOCKSIZE)
 
@@ -134,7 +135,7 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
 
        for (c = buf, j = 0; c < (buf + len); c += SSH_BLOCKSIZE, j++) {
                for (i = HASH(c) & (n - 1); h[i] != HASH_UNUSED;
-                    i = (i + 1) & (n - 1)) {
+                   i = (i + 1) & (n - 1)) {
                        if (h[i] == HASH_IV) {
                                if (!CMP(c, IV)) {
                                        if (check_crc(c, buf, len, IV))