diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-21 13:50:31 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-26 16:42:29 +0100 |
| commit | e586eac8858c3ea1f6094f5a3ea489e8e7f1973a (patch) | |
| tree | 8b19c97fca82b683aedf2ccde86105c84749d98d /ssl/statem/statem_clnt.c | |
| parent | 3348fc7e8940b66ab4545a618ba87a63fb677a79 (diff) | |
Add support for SSL_SESSION_is_resumable()
Provide a way to test whether the SSL_SESSION object can be used to resume a
sesion or not.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3008)
Diffstat (limited to 'ssl/statem/statem_clnt.c')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index a580431aa1..56c315e974 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -1049,13 +1049,9 @@ int tls_construct_client_hello(SSL *s, WPACKET *pkt) return 0; } - if ((sess == NULL) || !ssl_version_supported(s, sess->ssl_version) || - /* - * In the case of EAP-FAST, we can have a pre-shared - * "ticket" without a session ID. - */ - (!sess->session_id_length && !sess->ext.tick) || - (sess->not_resumable)) { + if (sess == NULL + || !ssl_version_supported(s, sess->ssl_version) + || !SSL_SESSION_is_resumable(sess)) { if (!ssl_get_new_session(s, 0)) return 0; } |