diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-08-04 02:55:06 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-08-06 03:07:17 +0200 |
| commit | 967226a1bdde59ea137e8f0df871854ff7b91366 (patch) | |
| tree | 59392d040b5d6f8762955db701bde5ef2f075b88 /dh.c | |
| parent | upstream: delay bailout for invalid authentic (diff) | |
| download | openssh-967226a1bdde59ea137e8f0df871854ff7b91366.tar.xz openssh-967226a1bdde59ea137e8f0df871854ff7b91366.zip | |
upstream: invalidate dh->priv_key after freeing it in error path;
avoids unlikely double-free later. Reported by Viktor Dukhovni via
https://github.com/openssh/openssh-portable/pull/96 feedback jsing@ tb@
OpenBSD-Commit-ID: e317eb17c3e05500ae851f279ef6486f0457c805
Diffstat (limited to 'dh.c')
| -rw-r--r-- | dh.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.65 2018/06/26 11:23:59 millert Exp $ */ +/* $OpenBSD: dh.c,v 1.66 2018/08/04 00:55:06 djm Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -279,6 +279,7 @@ dh_gen_key(DH *dh, int need) if (DH_generate_key(dh) == 0 || !dh_pub_is_valid(dh, dh->pub_key)) { BN_clear_free(dh->priv_key); + dh->priv_key = NULL; return SSH_ERR_LIBCRYPTO_ERROR; } return 0; |