- djm@cvs.openbsd.org 2006/03/19 07:41:30

[openssh.git] / deattack.c

diff --git a/deattack.c b/deattack.c
index 1a89be4b803887d318f5146926bad92ef7c65ce3..bf4451b8814439456d95c9f3c273cd523e39be58 100644 (file)
--- a/deattack.c
+++ b/deattack.c
@@ -1,5 +1,3 @@
-/*     $OpenBSD: deattack.c,v 1.14 2001/06/23 15:12:18 itojun Exp $    */
-
 /*
  * Cryptographic attack detector for ssh - source code
  *
@@ -20,6 +18,7 @@
  */
 
 #include "includes.h"
+
 #include "deattack.h"
 #include "log.h"
 #include "crc32.h"
@@ -36,7 +35,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)
 
@@ -50,22 +49,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);
@@ -81,13 +75,13 @@ 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;
-       register u_int32_t i, j;
+       u_int32_t i, j;
        u_int32_t l;
-       register u_char *c;
+       u_char *c;
        u_char *d;
 
        if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) ||
@@ -99,26 +93,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);
                n = l;
-               h = (u_int16_t *) xmalloc(n * HASH_ENTRYSIZE);
        } else {
                if (l > n) {
+                       h = (u_int16_t *) xrealloc(h, l * HASH_ENTRYSIZE);
                        n = l;
-                       h = (u_int16_t *) xrealloc(h, n * HASH_ENTRYSIZE);
                }
        }
 
        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;
@@ -129,21 +117,11 @@ 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, 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 (check_crc(c, buf, len, IV))
-                                               return (DEATTACK_DETECTED);
-                                       else
-                                               break;
-                               }
-                       } else if (!CMP(c, buf + h[i] * SSH_BLOCKSIZE)) {
-                               if (check_crc(c, buf, len, IV))
+                   i = (i + 1) & (n - 1)) {
+                       if (!CMP(c, buf + h[i] * SSH_BLOCKSIZE)) {
+                               if (check_crc(c, buf, len))
                                        return (DEATTACK_DETECTED);
                                else
                                        break;