From: Matt Caswell <matt@openssl.org>
Date: Mon, 12 Jun 2017 12:57:13 +0000 (+0100)
Subject: Fix an uninitialised variable warning
X-Git-Tag: OpenSSL_1_1_1-pre1~1301
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8acc27998bf253f0fd7c59d0e6aa515e5793ad01;p=oweals%2Fopenssl.git

Fix an uninitialised variable warning

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3623)
---

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 53b8ef9431..0f55d2652d 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2022,9 +2022,9 @@ WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst)
                 /* check whether we should disable session resumption */
                 if (s->not_resumable_session_cb != NULL)
                     s->session->not_resumable =
-                        s->not_resumable_session_cb(s, ((cipher->algorithm_mkey
-                                                        & (SSL_kDHE | SSL_kECDHE))
-                                                       != 0));
+                        s->not_resumable_session_cb(s,
+                            ((s->s3->tmp.new_cipher->algorithm_mkey
+                              & (SSL_kDHE | SSL_kECDHE)) != 0));
                 if (s->session->not_resumable)
                     /* do not send a session ticket */
                     s->ext.ticket_expected = 0;