projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0de6d66
)
Fix an uninitialised variable warning
author
Matt Caswell
<matt@openssl.org>
Mon, 12 Jun 2017 12:57:13 +0000
(13:57 +0100)
committer
Matt Caswell
<matt@openssl.org>
Fri, 16 Jun 2017 09:57:59 +0000
(10:57 +0100)
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3623)
ssl/statem/statem_srvr.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_srvr.c
b/ssl/statem/statem_srvr.c
index 53b8ef943184d186cbb811f2de35b74d5619bcdb..0f55d2652d3e21925001419cbfe69128d39adff8 100644
(file)
--- 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;