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 /digest-libc.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 'digest-libc.c')
-rw-r--r-- | digest-libc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/digest-libc.c b/digest-libc.c index 12737e5d5..86a1dbf29 100644 --- a/digest-libc.c +++ b/digest-libc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: digest-libc.c,v 1.6 2017/05/08 22:57:38 djm Exp $ */ | 1 | /* $OpenBSD: digest-libc.c,v 1.7 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2013 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2013 Damien Miller <djm@mindrot.org> |
4 | * Copyright (c) 2014 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2014 Markus Friedl. All rights reserved. |
@@ -230,8 +230,7 @@ ssh_digest_free(struct ssh_digest_ctx *ctx) | |||
230 | if (digest) { | 230 | if (digest) { |
231 | explicit_bzero(ctx->mdctx, digest->ctx_len); | 231 | explicit_bzero(ctx->mdctx, digest->ctx_len); |
232 | free(ctx->mdctx); | 232 | free(ctx->mdctx); |
233 | explicit_bzero(ctx, sizeof(*ctx)); | 233 | freezero(ctx, sizeof(*ctx)); |
234 | free(ctx); | ||
235 | } | 234 | } |
236 | } | 235 | } |
237 | } | 236 | } |