From 36d7056f4de36fa40cf9e16d7d21c64ae8763f80 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 14 Jul 2008 12:04:43 +1000 Subject: [PATCH] - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash; reported by cristian.ionescu-idbohrn AT axis.com --- ChangeLog | 4 +++- umac.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b411bd77f..611e87342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ cristian.ionescu-idbohrn AT axis.com - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close() prototype; reported by cristian.ionescu-idbohrn AT axis.com + - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash; + reported by cristian.ionescu-idbohrn AT axis.com 20080712 - (djm) OpenBSD CVS Sync @@ -4656,4 +4658,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5080 2008/07/14 02:03:27 djm Exp $ +$Id: ChangeLog,v 1.5081 2008/07/14 02:04:43 djm Exp $ diff --git a/umac.c b/umac.c index 1eba663c0..92902bc09 100644 --- a/umac.c +++ b/umac.c @@ -181,14 +181,14 @@ typedef AES_KEY aes_int_key[1]; /* The user-supplied UMAC key is stretched using AES in a counter * mode to supply all random bits needed by UMAC. The kdf function takes * an AES internal key representation 'key' and writes a stream of - * 'nbytes' bytes to the memory pointed at by 'buffer_ptr'. Each distinct + * 'nbytes' bytes to the memory pointed at by 'bufp'. Each distinct * 'ndx' causes a distinct byte stream. */ -static void kdf(void *buffer_ptr, aes_int_key key, UINT8 ndx, int nbytes) +static void kdf(void *bufp, aes_int_key key, UINT8 ndx, int nbytes) { UINT8 in_buf[AES_BLOCK_LEN] = {0}; UINT8 out_buf[AES_BLOCK_LEN]; - UINT8 *dst_buf = (UINT8 *)buffer_ptr; + UINT8 *dst_buf = (UINT8 *)bufp; int i; /* Setup the initial value */