diff options
author | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:09:48 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:09:48 +0000 |
commit | 210ca37aa0cdf5499f0ea847ec150fefbfbf7c39 (patch) | |
tree | 64829a84f903d7e2d3270c43e3f80df7db2a6a10 /umac.c | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) |
merge 6.4p1
Diffstat (limited to 'umac.c')
-rw-r--r-- | umac.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: umac.c,v 1.7 2013/07/22 05:00:17 djm Exp $ */ | 1 | /* $OpenBSD: umac.c,v 1.8 2013/11/08 00:39:15 djm Exp $ */ |
2 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
3 | * | 3 | * |
4 | * umac.c -- C Implementation UMAC Message Authentication | 4 | * umac.c -- C Implementation UMAC Message Authentication |
@@ -1227,7 +1227,7 @@ struct umac_ctx *umac_new(const u_char key[]) | |||
1227 | size_t bytes_to_add; | 1227 | size_t bytes_to_add; |
1228 | aes_int_key prf_key; | 1228 | aes_int_key prf_key; |
1229 | 1229 | ||
1230 | octx = ctx = xmalloc(sizeof(*ctx) + ALLOC_BOUNDARY); | 1230 | octx = ctx = xcalloc(1, sizeof(*ctx) + ALLOC_BOUNDARY); |
1231 | if (ctx) { | 1231 | if (ctx) { |
1232 | if (ALLOC_BOUNDARY) { | 1232 | if (ALLOC_BOUNDARY) { |
1233 | bytes_to_add = ALLOC_BOUNDARY - | 1233 | bytes_to_add = ALLOC_BOUNDARY - |