From 3f9418893e1254bda3b87e7d3af7029d11b0a6c7 Mon Sep 17 00:00:00 2001 From: Damien Miller 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@ --- mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mac.c') diff --git a/mac.c b/mac.c index c155dbd3..02bcc31e 100644 --- a/mac.c +++ b/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 #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); -- cgit v1.2.1