From 3f9418893e1254bda3b87e7d3af7029d11b0a6c7 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 31 Mar 2006 23:13:02 +1100
Subject:    - djm@cvs.openbsd.org 2006/03/30 09:58:16      [authfd.c bufaux.c
 deattack.c gss-serv.c mac.c misc.c misc.h]      [monitor_wrap.c msg.c
 packet.c sftp-client.c sftp-server.c ssh-agent.c]      replace
 {GET,PUT}_XXBIT macros with functionally similar functions,      silencing a
 heap of lint warnings. also allows them to use      __bounded__ checking
 which can't be applied to macros; requested      by and feedback from
 deraadt@

---
 deattack.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'deattack.c')

diff --git a/deattack.c b/deattack.c
index 2adf185e..fa397e6e 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deattack.c,v 1.26 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: deattack.c,v 1.27 2006/03/30 09:58:15 djm Exp $ */
 /*
  * Cryptographic attack detector for ssh - source code
  *
@@ -23,8 +23,8 @@
 #include "deattack.h"
 #include "log.h"
 #include "crc32.h"
-#include "getput.h"
 #include "xmalloc.h"
+#include "misc.h"
 
 /* SSH Constants */
 #define SSH_MAXBLOCKS	(32 * 1024)
@@ -42,7 +42,7 @@
 
 
 /* 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))
 
-- 
cgit v1.2.3