1 files changed, 18 insertions, 36 deletions

diff --git a/deattack.c b/deattack.c
index d174abc76..1b37e4dab 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: deattack.c,v 1.30 2006/09/16 19:53:37 djm Exp $ */
 /*
  * Cryptographic attack detector for ssh - source code
  *
@@ -18,14 +19,18 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: deattack.c,v 1.19 2003/09/18 08:49:45 markus Exp $");
 
+#include <sys/types.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "xmalloc.h"
 #include "deattack.h"
 #include "log.h"
 #include "crc32.h"
-#include "getput.h"
-#include "xmalloc.h"
-#include "deattack.h"
+#include "misc.h"
 
 /*
  * CRC attack detection has a worst-case behaviour that is O(N^3) over
@@ -61,7 +66,7 @@ RCSID("$OpenBSD: deattack.c,v 1.19 2003/09/18 08:49:45 markus Exp $");
 
 
 /* Hash function (Input keys are cipher results) */
-#define HASH(x)         GET_32BIT(x)
+#define HASH(x)         get_u32(x)
 
 #define CMP(a, b)       (memcmp(a, b, SSH_BLOCKSIZE))
 
@@ -69,22 +74,17 @@ static void
 crc_update(u_int32_t *a, u_int32_t b)
 {
         b ^= *a;
-        *a = ssh_crc32((u_char *) &b, sizeof(b));
+        *a = ssh_crc32((u_char *)&b, sizeof(b));
 }
 
 /* detect if a block is used in a particular pattern */
 static int
-check_crc(u_char *S, u_char *buf, u_int32_t len,
-          u_char *IV)
+check_crc(u_char *S, u_char *buf, u_int32_t len)
 {
         u_int32_t crc;
         u_char *c;
 
         crc = 0;
-        if (IV && !CMP(S, IV)) {
-                crc_update(&crc, 1);
-                crc_update(&crc, 0);
-        }
         for (c = buf; c < buf + len; c += SSH_BLOCKSIZE) {
                 if (!CMP(S, c)) {
                         crc_update(&crc, 1);
@@ -100,7 +100,7 @@ check_crc(u_char *S, u_char *buf, u_int32_t len,
 
 /* Detect a crc32 compensation attack on a packet */
 int
-detect_attack(u_char *buf, u_int32_t len, u_char *IV)
+detect_attack(u_char *buf, u_int32_t len)
 {
         static u_int16_t *h = (u_int16_t *) NULL;
         static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
@@ -118,26 +118,20 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
 
         if (h == NULL) {
                 debug("Installing crc compensation attack detector.");
-                h = (u_int16_t *) xmalloc(l * HASH_ENTRYSIZE);
+                h = (u_int16_t *) xcalloc(l, HASH_ENTRYSIZE);
                 n = l;
         } else {
                 if (l > n) {
-                        h = (u_int16_t *) xrealloc(h, l * HASH_ENTRYSIZE);
+                        h = (u_int16_t *)xrealloc(h, l, HASH_ENTRYSIZE);
                         n = l;
                 }
         }
 
         if (len <= HASH_MINBLOCKS) {
                 for (c = buf; c < buf + len; c += SSH_BLOCKSIZE) {
-                        if (IV && (!CMP(c, IV))) {
-                                if ((check_crc(c, buf, len, IV)))
-                                        return (DEATTACK_DETECTED);
-                                else
-                                        break;
-                        }
                         for (d = buf; d < c; d += SSH_BLOCKSIZE) {
                                 if (!CMP(c, d)) {
-                                        if ((check_crc(c, buf, len, IV)))
+                                        if ((check_crc(c, buf, len)))
                                                 return (DEATTACK_DETECTED);
                                         else
                                                 break;
@@ -148,25 +142,13 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
         }
         memset(h, HASH_UNUSEDCHAR, n * HASH_ENTRYSIZE);
 
-        if (IV)
-                h[HASH(IV) & (n - 1)] = HASH_IV;
-
         for (c = buf, same = j = 0; c < (buf + len); c += SSH_BLOCKSIZE, j++) {
                 for (i = HASH(c) & (n - 1); h[i] != HASH_UNUSED;
                     i = (i + 1) & (n - 1)) {
-                        if (h[i] == HASH_IV) {
-                                if (!CMP(c, IV)) {
-                                        if (++same > MAX_IDENTICAL)
-                                                return (DEATTACK_DOS_DETECTED);
-                                        if (check_crc(c, buf, len, IV))
-                                                return (DEATTACK_DETECTED);
-                                        else
-                                                break;
-                                }
-                        } else if (!CMP(c, buf + h[i] * SSH_BLOCKSIZE)) {
+                        if (!CMP(c, buf + h[i] * SSH_BLOCKSIZE)) {
                                 if (++same > MAX_IDENTICAL)
                                         return (DEATTACK_DOS_DETECTED);
-                                if (check_crc(c, buf, len, IV))
+                                if (check_crc(c, buf, len))
                                         return (DEATTACK_DETECTED);
                                 else
                                         break;