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-ed25519-sk.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-ed25519-sk.c')
-rw-r--r-- | ssh-ed25519-sk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-ed25519-sk.c b/ssh-ed25519-sk.c index b6f28c09a..f784776d4 100644 --- a/ssh-ed25519-sk.c +++ b/ssh-ed25519-sk.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.4 2019/11/26 03:04:27 djm Exp $ */ | 1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.5 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -154,10 +154,8 @@ ssh_ed25519_sk_verify(const struct sshkey *key, | |||
154 | details = NULL; | 154 | details = NULL; |
155 | } | 155 | } |
156 | out: | 156 | out: |
157 | if (m != NULL) { | 157 | if (m != NULL) |
158 | explicit_bzero(m, smlen); /* NB mlen may be invalid if r != 0 */ | 158 | freezero(m, smlen); /* NB mlen may be invalid if r != 0 */ |
159 | free(m); | ||
160 | } | ||
161 | sshkey_sig_details_free(details); | 159 | sshkey_sig_details_free(details); |
162 | sshbuf_free(b); | 160 | sshbuf_free(b); |
163 | sshbuf_free(encoded); | 161 | sshbuf_free(encoded); |