diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-02-26 13:40:10 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-02-26 13:40:10 +0000 |
| commit | 7d9906cf5784b21f9d2afab98129af86715d51d8 (patch) | |
| tree | 1d38bfb6ebb0674052bf0164b7d957d5def05464 /usr.bin/ssh/umac.c | |
| parent | fb45ee0a45364eeff0ab5dbbff8f2fd9f27266f9 (diff) | |
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@
Diffstat (limited to 'usr.bin/ssh/umac.c')
| -rw-r--r-- | usr.bin/ssh/umac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/umac.c b/usr.bin/ssh/umac.c index 6f53eea76e0..c5a8d5ce2a3 100644 --- a/usr.bin/ssh/umac.c +++ b/usr.bin/ssh/umac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umac.c,v 1.18 2019/11/13 04:47:52 deraadt Exp $ */ +/* $OpenBSD: umac.c,v 1.19 2020/02/26 13:40:09 jsg Exp $ */ /* ----------------------------------------------------------------------- * * umac.c -- C Implementation UMAC Message Authentication @@ -1201,8 +1201,7 @@ int umac_delete(struct umac_ctx *ctx) if (ctx) { if (ALLOC_BOUNDARY) ctx = (struct umac_ctx *)ctx->free_ptr; - explicit_bzero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); - free(ctx); + freezero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); } return (1); } |