summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-12 13:57:13 +0100
committerMatt Caswell <matt@openssl.org>2017-06-16 10:57:59 +0100
commit8acc27998bf253f0fd7c59d0e6aa515e5793ad01 (patch)
treee173a75d38f2decc373fe9523a1ca638d3fc0a5e
parent0de6d66d36dc5f6d46247c63da71b73d7e8e018c (diff)
Fix an uninitialised variable warning
Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/3623)
-rw-r--r--ssl/statem/statem_srvr.c6
1 files changed, 3 insertions, 3 deletions
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;