From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 6 Apr 2012 11:35:45 +0000 (+0000)
Subject: Backport: initialise dh_clnt (from HEAD)
X-Git-Tag: OpenSSL_1_0_2-beta1~692
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6cfccfec3349edd01553f538e4f32fb000930385;p=oweals%2Fopenssl.git

Backport: initialise dh_clnt (from HEAD)
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index c4ff1ea7a6..be64f95646 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2466,6 +2466,7 @@ int ssl3_send_client_key_exchange(SSL *s)
 				{
 				/* Use client certificate key */
 				EVP_PKEY *clkey = s->cert->key->privatekey;
+				dh_clnt = NULL;
 				if (clkey)
 					dh_clnt = EVP_PKEY_get1_DH(clkey);
 				if (dh_clnt == NULL)