RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-03 00:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash;

Browse Source 
reported by cristian.ionescu-idbohrn AT axis.com
This commit is contained in:
Damien Miller 2008-07-14 12:04:43 +10:00
parent 639ce593d4
commit 36d7056f4d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -20,6 +20,8 @@
cristian.ionescu-idbohrn AT axis.com cristian.ionescu-idbohrn AT axis.com
- (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close() - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close()
prototype; reported by cristian.ionescu-idbohrn AT axis.com 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 20080712
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -4656,4 +4658,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

6
umac.c
View File

@ -181,14 +181,14 @@ typedef AES_KEY aes_int_key[1];
/* The user-supplied UMAC key is stretched using AES in a counter /* 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 * mode to supply all random bits needed by UMAC. The kdf function takes
* an AES internal key representation 'key' and writes a stream of * 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. * '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 in_buf[AES_BLOCK_LEN] = {0};
UINT8 out_buf[AES_BLOCK_LEN]; UINT8 out_buf[AES_BLOCK_LEN];
UINT8 *dst_buf = (UINT8 *)buffer_ptr; UINT8 *dst_buf = (UINT8 *)bufp;
int i; int i;
/* Setup the initial value */ /* Setup the initial value */