diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-12-10 16:45:39 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-12-10 16:45:39 +0000 |
| commit | 42aa3ec4f20c61ffab48d801085fcf5823c27ed1 (patch) | |
| tree | 7b47af8a85fa50fd0e3f6bcd9b025b70b4c7149f /ssl | |
| parent | bb152dae8f47db94b5cd834a82f3a0925412b8e5 (diff) | |
PR: 2888
Reported by: Daniel Black <daniel.black@openquery.com>
Support renewing session tickets (backport from HEAD).
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 2c9fb87f52..a17beb8a3b 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -262,7 +262,16 @@ int ssl3_connect(SSL *s) ret=ssl3_get_server_hello(s); if (ret <= 0) goto end; if (s->hit) + { s->state=SSL3_ST_CR_FINISHED_A; +#ifndef OPENSSL_NO_TLSEXT + if (s->tlsext_ticket_expected) + { + /* receive renewed session ticket */ + s->state=SSL3_ST_CR_SESSION_TICKET_A; + } +#endif + } else s->state=SSL3_ST_CR_CERT_A; s->init_num=0; |