summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/mac.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2006-03-30 09:58:15 +0000
committerdjm <djm@openbsd.org>2006-03-30 09:58:15 +0000
commit4fad3025d21ab2407507d77a8924b309b7a88ffb (patch)
treead3ae65d2853f74a0a40adf9210aa4eca4369df3 /usr.bin/ssh/mac.c
parentMinor cleanup and start using rmx_refcnt to show the refcount instead of 0. (diff)
downloadwireguard-openbsd-4fad3025d21ab2407507d77a8924b309b7a88ffb.tar.xz
wireguard-openbsd-4fad3025d21ab2407507d77a8924b309b7a88ffb.zip
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@
Diffstat (limited to 'usr.bin/ssh/mac.c')
-rw-r--r--usr.bin/ssh/mac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c
index c155dbd3f8d..02bcc31edb0 100644
--- a/usr.bin/ssh/mac.c
+++ b/usr.bin/ssh/mac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac.c,v 1.9 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: mac.c,v 1.10 2006/03/30 09:58:15 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -28,11 +28,11 @@
#include <openssl/hmac.h>
#include "xmalloc.h"
-#include "getput.h"
#include "log.h"
#include "cipher.h"
#include "kex.h"
#include "mac.h"
+#include "misc.h"
struct {
char *name;
@@ -83,7 +83,7 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
if (mac->mac_len > sizeof(m))
fatal("mac_compute: mac too long");
HMAC_Init(&c, mac->key, mac->key_len, mac->md);
- PUT_32BIT(b, seqno);
+ put_u32(b, seqno);
HMAC_Update(&c, b, sizeof(b));
HMAC_Update(&c, data, datalen);
HMAC_Final(&c, m, NULL);