PR: 2888

Reported by: Daniel Black <daniel.black@openquery.com>

Support renewing session tickets (backport from HEAD).

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 53223bd38d162734e05cd60204c991dff3af0913..fc53161866d90abf1541c52691dc4d55fd22964c 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -280,7 +280,16 @@ int ssl3_connect(SSL *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;