summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--umac.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a590cf9d0..379dff4df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - djm@cvs.openbsd.org 2011/10/19 00:06:10 9 - djm@cvs.openbsd.org 2011/10/19 00:06:10
10 [moduli.c] 10 [moduli.c]
11 s/tmpfile/tmp/ to make this -Wshadow clean 11 s/tmpfile/tmp/ to make this -Wshadow clean
12 - djm@cvs.openbsd.org 2011/10/19 10:39:48
13 [umac.c]
14 typo in comment; patch from Michael W. Bombardieri
12 15
1320111025 1620111025
14 - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file 17 - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file
diff --git a/umac.c b/umac.c
index 92902bc09..e78d2cc5f 100644
--- a/umac.c
+++ b/umac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: umac.c,v 1.3 2008/05/12 20:52:20 pvalchev Exp $ */ 1/* $OpenBSD: umac.c,v 1.4 2011/10/19 10:39:48 djm Exp $ */
2/* ----------------------------------------------------------------------- 2/* -----------------------------------------------------------------------
3 * 3 *
4 * umac.c -- C Implementation UMAC Message Authentication 4 * umac.c -- C Implementation UMAC Message Authentication
@@ -316,7 +316,7 @@ static void pdf_gen_xor(pdf_ctx *pc, UINT8 nonce[8], UINT8 buf[8])
316 316
317typedef struct { 317typedef struct {
318 UINT8 nh_key [L1_KEY_LEN + L1_KEY_SHIFT * (STREAMS - 1)]; /* NH Key */ 318 UINT8 nh_key [L1_KEY_LEN + L1_KEY_SHIFT * (STREAMS - 1)]; /* NH Key */
319 UINT8 data [HASH_BUF_BYTES]; /* Incomming data buffer */ 319 UINT8 data [HASH_BUF_BYTES]; /* Incoming data buffer */
320 int next_data_empty; /* Bookeeping variable for data buffer. */ 320 int next_data_empty; /* Bookeeping variable for data buffer. */
321 int bytes_hashed; /* Bytes (out of L1_KEY_LEN) incorperated. */ 321 int bytes_hashed; /* Bytes (out of L1_KEY_LEN) incorperated. */
322 UINT64 state[STREAMS]; /* on-line state */ 322 UINT64 state[STREAMS]; /* on-line state */