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 /kex.c | |
| parent | 9e3220b585c5be19a7431ea4ff8884c137b3a81c (diff) | |
| download | openssh-git-d5ba1c03278eb079438bb038266d80d7477d49cb.tar.gz | |
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 'kex.c')
| -rw-r--r-- | kex.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.156 2020/01/23 10:24:29 dtucker Exp $ */ +/* $OpenBSD: kex.c,v 1.157 2020/02/26 13:40:09 jsg Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -670,8 +670,7 @@ kex_free_newkeys(struct newkeys *newkeys) } free(newkeys->mac.name); explicit_bzero(&newkeys->mac, sizeof(newkeys->mac)); - explicit_bzero(newkeys, sizeof(*newkeys)); - free(newkeys); + freezero(newkeys, sizeof(*newkeys)); } void |