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 /cipher.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 'cipher.c')
| -rw-r--r-- | cipher.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.114 2020/01/23 10:24:29 dtucker Exp $ */ +/* $OpenBSD: cipher.c,v 1.115 2020/02/26 13:40:09 jsg Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -328,8 +328,7 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher, #ifdef WITH_OPENSSL EVP_CIPHER_CTX_free(cc->evp); #endif /* WITH_OPENSSL */ - explicit_bzero(cc, sizeof(*cc)); - free(cc); + freezero(cc, sizeof(*cc)); } } return ret; @@ -434,8 +433,7 @@ cipher_free(struct sshcipher_ctx *cc) EVP_CIPHER_CTX_free(cc->evp); cc->evp = NULL; #endif - explicit_bzero(cc, sizeof(*cc)); - free(cc); + freezero(cc, sizeof(*cc)); } /* |