From 5d67f2c4e9ba52e0cb9a514ed61019b919c72212 Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sat, 4 Aug 2018 00:55:06 +0000
Subject: [PATCH] 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@

---
 usr.bin/ssh/dh.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c
index 9ebde8f7a0f..4b55d18b011 100644
--- a/usr.bin/ssh/dh.c
+++ b/usr.bin/ssh/dh.c
@@ -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.
  *
@@ -275,6 +275,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;
-- 
2.20.1