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 /ssh-dss.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 'ssh-dss.c')
-rw-r--r-- | ssh-dss.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-dss.c,v 1.37 2018/02/07 02:06:51 jsing Exp $ */ | 1 | /* $OpenBSD: ssh-dss.c,v 1.39 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -200,10 +200,8 @@ ssh_dss_verify(const struct sshkey *key, | |||
200 | BN_clear_free(sig_s); | 200 | BN_clear_free(sig_s); |
201 | sshbuf_free(b); | 201 | sshbuf_free(b); |
202 | free(ktype); | 202 | free(ktype); |
203 | if (sigblob != NULL) { | 203 | if (sigblob != NULL) |
204 | explicit_bzero(sigblob, len); | 204 | freezero(sigblob, len); |
205 | free(sigblob); | ||
206 | } | ||
207 | return ret; | 205 | return ret; |
208 | } | 206 | } |
209 | #endif /* WITH_OPENSSL */ | 207 | #endif /* WITH_OPENSSL */ |