diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-06-27 06:29:35 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-06-28 11:30:18 +1000 |
commit | b2e3e57be4a933d9464bccbe592573725765486f (patch) | |
tree | 1ef7b579a463285b8524d94dd6a8bda80b2f6429 | |
parent | 58ceacdcbaebefc77d120712de55c6fc6aa32bb1 (diff) |
upstream: fix NULL deference (bzero) on err
=?UTF-8?q?or=20path=20added=20in=20last=20commit;=20spotted=20by=20Reynir?=
=?UTF-8?q?=20Bj=C3=B6rnsson?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ok deraadt@ markus@ tb@
OpenBSD-Commit-ID: b11b084bcc551b2c630560eb08618dd501027bbd
-rw-r--r-- | sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.77 2019/06/23 12:21:46 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.78 2019/06/27 06:29:35 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -1985,9 +1985,9 @@ sshkey_shield_private(struct sshkey *k) | |||
1985 | out: | 1985 | out: |
1986 | /* XXX behaviour on error - invalidate original private key? */ | 1986 | /* XXX behaviour on error - invalidate original private key? */ |
1987 | cipher_free(cctx); | 1987 | cipher_free(cctx); |
1988 | explicit_bzero(enc, enclen); | ||
1989 | explicit_bzero(keyiv, sizeof(keyiv)); | 1988 | explicit_bzero(keyiv, sizeof(keyiv)); |
1990 | explicit_bzero(&tmp, sizeof(tmp)); | 1989 | explicit_bzero(&tmp, sizeof(tmp)); |
1990 | freezero(enc, enclen); | ||
1991 | freezero(prekey, SSHKEY_SHIELD_PREKEY_LEN); | 1991 | freezero(prekey, SSHKEY_SHIELD_PREKEY_LEN); |
1992 | sshkey_free(kswap); | 1992 | sshkey_free(kswap); |
1993 | sshbuf_free(prvbuf); | 1993 | sshbuf_free(prvbuf); |