summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--umac.h14
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 480c9988f..c67a10a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 [umac.c] 7 [umac.c]
8 make MAC key, data to be hashed and nonce for final hash const; 8 make MAC key, data to be hashed and nonce for final hash const;
9 checked with -Wcast-qual 9 checked with -Wcast-qual
10 - djm@cvs.openbsd.org 2013/07/22 12:20:02
11 [umac.h]
12 oops, forgot to commit corresponding header change;
13 spotted by jsg and jasper
10 14
1120130720 1520130720
12 - (djm) OpenBSD CVS Sync 16 - (djm) OpenBSD CVS Sync
diff --git a/umac.h b/umac.h
index 6795112a3..7fb770f8a 100644
--- a/umac.h
+++ b/umac.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: umac.h,v 1.2 2012/10/04 13:21:50 markus Exp $ */ 1/* $OpenBSD: umac.h,v 1.3 2013/07/22 12:20:02 djm Exp $ */
2/* ----------------------------------------------------------------------- 2/* -----------------------------------------------------------------------
3 * 3 *
4 * umac.h -- C Implementation UMAC Message Authentication 4 * umac.h -- C Implementation UMAC Message Authentication
@@ -52,7 +52,7 @@
52 extern "C" { 52 extern "C" {
53#endif 53#endif
54 54
55struct umac_ctx *umac_new(u_char key[]); 55struct umac_ctx *umac_new(const u_char key[]);
56/* Dynamically allocate a umac_ctx struct, initialize variables, 56/* Dynamically allocate a umac_ctx struct, initialize variables,
57 * generate subkeys from key. 57 * generate subkeys from key.
58 */ 58 */
@@ -62,10 +62,10 @@ int umac_reset(struct umac_ctx *ctx);
62/* Reset a umac_ctx to begin authenicating a new message */ 62/* Reset a umac_ctx to begin authenicating a new message */
63#endif 63#endif
64 64
65int umac_update(struct umac_ctx *ctx, u_char *input, long len); 65int umac_update(struct umac_ctx *ctx, const u_char *input, long len);
66/* Incorporate len bytes pointed to by input into context ctx */ 66/* Incorporate len bytes pointed to by input into context ctx */
67 67
68int umac_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]); 68int umac_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]);
69/* Incorporate any pending data and the ctr value, and return tag. 69/* Incorporate any pending data and the ctr value, and return tag.
70 * This function returns error code if ctr < 0. 70 * This function returns error code if ctr < 0.
71 */ 71 */
@@ -117,9 +117,9 @@ int uhash(uhash_ctx_t ctx,
117#endif 117#endif
118 118
119/* matching umac-128 API, we reuse umac_ctx, since it's opaque */ 119/* matching umac-128 API, we reuse umac_ctx, since it's opaque */
120struct umac_ctx *umac128_new(u_char key[]); 120struct umac_ctx *umac128_new(const u_char key[]);
121int umac128_update(struct umac_ctx *ctx, u_char *input, long len); 121int umac128_update(struct umac_ctx *ctx, const u_char *input, long len);
122int umac128_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]); 122int umac128_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]);
123int umac128_delete(struct umac_ctx *ctx); 123int umac128_delete(struct umac_ctx *ctx);
124 124
125#ifdef __cplusplus 125#ifdef __cplusplus