summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-25 11:55:39 +1000
committerDamien Miller <djm@mindrot.org>2013-07-25 11:55:39 +1000
commit94c9cd34d1590ea1d4bf76919a15b5688fa90ed1 (patch)
tree1c403d16c216968a1b93a4b2dc19e4d7c4a5c9c9
parentc331dbd22297ab9bf351abee659893d139c9f28a (diff)
- djm@cvs.openbsd.org 2013/07/22 12:20:02
[umac.h] oops, forgot to commit corresponding header change; spotted by jsg and jasper
-rw-r--r--ChangeLog4
-rw-r--r--umac.h14
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 480c9988..c67a10a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
[umac.c]
make MAC key, data to be hashed and nonce for final hash const;
checked with -Wcast-qual
+ - djm@cvs.openbsd.org 2013/07/22 12:20:02
+ [umac.h]
+ oops, forgot to commit corresponding header change;
+ spotted by jsg and jasper
20130720
- (djm) OpenBSD CVS Sync
diff --git a/umac.h b/umac.h
index 6795112a..7fb770f8 100644
--- a/umac.h
+++ b/umac.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.h,v 1.2 2012/10/04 13:21:50 markus Exp $ */
+/* $OpenBSD: umac.h,v 1.3 2013/07/22 12:20:02 djm Exp $ */
/* -----------------------------------------------------------------------
*
* umac.h -- C Implementation UMAC Message Authentication
@@ -52,7 +52,7 @@
extern "C" {
#endif
-struct umac_ctx *umac_new(u_char key[]);
+struct umac_ctx *umac_new(const u_char key[]);
/* Dynamically allocate a umac_ctx struct, initialize variables,
* generate subkeys from key.
*/
@@ -62,10 +62,10 @@ int umac_reset(struct umac_ctx *ctx);
/* Reset a umac_ctx to begin authenicating a new message */
#endif
-int umac_update(struct umac_ctx *ctx, u_char *input, long len);
+int umac_update(struct umac_ctx *ctx, const u_char *input, long len);
/* Incorporate len bytes pointed to by input into context ctx */
-int umac_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]);
+int umac_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]);
/* Incorporate any pending data and the ctr value, and return tag.
* This function returns error code if ctr < 0.
*/
@@ -117,9 +117,9 @@ int uhash(uhash_ctx_t ctx,
#endif
/* matching umac-128 API, we reuse umac_ctx, since it's opaque */
-struct umac_ctx *umac128_new(u_char key[]);
-int umac128_update(struct umac_ctx *ctx, u_char *input, long len);
-int umac128_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]);
+struct umac_ctx *umac128_new(const u_char key[]);
+int umac128_update(struct umac_ctx *ctx, const u_char *input, long len);
+int umac128_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]);
int umac128_delete(struct umac_ctx *ctx);
#ifdef __cplusplus