diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | umac.c | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -20,6 +20,8 @@ | |||
20 | cristian.ionescu-idbohrn AT axis.com | 20 | cristian.ionescu-idbohrn AT axis.com |
21 | - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close() | 21 | - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close() |
22 | prototype; reported by cristian.ionescu-idbohrn AT axis.com | 22 | prototype; reported by cristian.ionescu-idbohrn AT axis.com |
23 | - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash; | ||
24 | reported by cristian.ionescu-idbohrn AT axis.com | ||
23 | 25 | ||
24 | 20080712 | 26 | 20080712 |
25 | - (djm) OpenBSD CVS Sync | 27 | - (djm) OpenBSD CVS Sync |
@@ -4656,4 +4658,4 @@ | |||
4656 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4658 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4657 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4659 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4658 | 4660 | ||
4659 | $Id: ChangeLog,v 1.5080 2008/07/14 02:03:27 djm Exp $ | 4661 | $Id: ChangeLog,v 1.5081 2008/07/14 02:04:43 djm Exp $ |
@@ -181,14 +181,14 @@ typedef AES_KEY aes_int_key[1]; | |||
181 | /* The user-supplied UMAC key is stretched using AES in a counter | 181 | /* The user-supplied UMAC key is stretched using AES in a counter |
182 | * mode to supply all random bits needed by UMAC. The kdf function takes | 182 | * mode to supply all random bits needed by UMAC. The kdf function takes |
183 | * an AES internal key representation 'key' and writes a stream of | 183 | * an AES internal key representation 'key' and writes a stream of |
184 | * 'nbytes' bytes to the memory pointed at by 'buffer_ptr'. Each distinct | 184 | * 'nbytes' bytes to the memory pointed at by 'bufp'. Each distinct |
185 | * 'ndx' causes a distinct byte stream. | 185 | * 'ndx' causes a distinct byte stream. |
186 | */ | 186 | */ |
187 | static void kdf(void *buffer_ptr, aes_int_key key, UINT8 ndx, int nbytes) | 187 | static void kdf(void *bufp, aes_int_key key, UINT8 ndx, int nbytes) |
188 | { | 188 | { |
189 | UINT8 in_buf[AES_BLOCK_LEN] = {0}; | 189 | UINT8 in_buf[AES_BLOCK_LEN] = {0}; |
190 | UINT8 out_buf[AES_BLOCK_LEN]; | 190 | UINT8 out_buf[AES_BLOCK_LEN]; |
191 | UINT8 *dst_buf = (UINT8 *)buffer_ptr; | 191 | UINT8 *dst_buf = (UINT8 *)bufp; |
192 | int i; | 192 | int i; |
193 | 193 | ||
194 | /* Setup the initial value */ | 194 | /* Setup the initial value */ |