diff options
author | jsg@openbsd.org <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-28 12:26:28 +1100 |
commit | d5ba1c03278eb079438bb038266d80d7477d49cb (patch) | |
tree | 6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /umac.c | |
parent | 9e3220b585c5be19a7431ea4ff8884c137b3a81c (diff) |
upstream: change explicit_bzero();free() to freezero()
While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.
ok deraadt@ djm@
OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a
Diffstat (limited to 'umac.c')
-rw-r--r-- | umac.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: umac.c,v 1.18 2019/11/13 04:47:52 deraadt Exp $ */ | 1 | /* $OpenBSD: umac.c,v 1.19 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
3 | * | 3 | * |
4 | * umac.c -- C Implementation UMAC Message Authentication | 4 | * umac.c -- C Implementation UMAC Message Authentication |
@@ -1205,8 +1205,7 @@ int umac_delete(struct umac_ctx *ctx) | |||
1205 | if (ctx) { | 1205 | if (ctx) { |
1206 | if (ALLOC_BOUNDARY) | 1206 | if (ALLOC_BOUNDARY) |
1207 | ctx = (struct umac_ctx *)ctx->free_ptr; | 1207 | ctx = (struct umac_ctx *)ctx->free_ptr; |
1208 | explicit_bzero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); | 1208 | freezero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); |
1209 | free(ctx); | ||
1210 | } | 1209 | } |
1211 | return (1); | 1210 | return (1); |
1212 | } | 1211 | } |