diff options
| author |   jsg <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
| commit | c9831b39c7f05cf54db0775dea423b6be448db6e (patch) | |
| tree | f50d8c53bee8b027f393d63b6867f7cdcf2c7a4b /usr.bin/ssh/ssh-ed25519-sk.c | |
| parent | Have sftp reject "-1" in the same way as ssh(1) and scp(1) do instead (diff) | |
| download | wireguard-openbsd-c9831b39c7f05cf54db0775dea423b6be448db6e.tar.xz wireguard-openbsd-c9831b39c7f05cf54db0775dea423b6be448db6e.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/ssh-ed25519-sk.c')
| -rw-r--r-- | usr.bin/ssh/ssh-ed25519-sk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-ed25519-sk.c b/usr.bin/ssh/ssh-ed25519-sk.c index 89bf479dc21..44ce9ec591c 100644 --- a/usr.bin/ssh/ssh-ed25519-sk.c +++ b/usr.bin/ssh/ssh-ed25519-sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-ed25519-sk.c,v 1.4 2019/11/26 03:04:27 djm Exp $ */ +/* $OpenBSD: ssh-ed25519-sk.c,v 1.5 2020/02/26 13:40:09 jsg Exp $ */ /* * Copyright (c) 2019 Markus Friedl. All rights reserved. * @@ -152,10 +152,8 @@ ssh_ed25519_sk_verify(const struct sshkey *key, details = NULL; } out: - if (m != NULL) { - explicit_bzero(m, smlen); /* NB mlen may be invalid if r != 0 */ - free(m); - } + if (m != NULL) + freezero(m, smlen); /* NB mlen may be invalid if r != 0 */ sshkey_sig_details_free(details); sshbuf_free(b); sshbuf_free(encoded); |