diff options
| author |   djm <djm@openbsd.org> | 2019-06-27 06:29:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-06-27 06:29:35 +0000 |
| commit | 8aa78e84f32788ad50768530ecad0d53857edf7b (patch) | |
| tree | da9b72b312d422137e5ecbe141f243bb8c76646b | |
| parent | If we don't receive a reply packet the res_send subquery will already have (diff) | |
| download | wireguard-openbsd-8aa78e84f32788ad50768530ecad0d53857edf7b.tar.xz wireguard-openbsd-8aa78e84f32788ad50768530ecad0d53857edf7b.zip | |
fix NULL deference (bzero) on error path added in last commit;
spotted by Reynir Björnsson
ok deraadt@ markus@ tb@
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 9d90c9a51a3..5cd2c919260 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.77 2019/06/23 12:21:46 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.78 2019/06/27 06:29:35 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -1943,9 +1943,9 @@ sshkey_shield_private(struct sshkey *k) out: /* XXX behaviour on error - invalidate original private key? */ cipher_free(cctx); - explicit_bzero(enc, enclen); explicit_bzero(keyiv, sizeof(keyiv)); explicit_bzero(&tmp, sizeof(tmp)); + freezero(enc, enclen); freezero(prekey, SSHKEY_SHIELD_PREKEY_LEN); sshkey_free(kswap); sshbuf_free(prvbuf); |