Fix session handling.

[openssl.git] / ssl / s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 22be653f590c70d7cfac75e23028d593dc6aef29..6cf6e6f3783344307c426639e9d564e086fa7bfc 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -297,7 +297,16 @@ int ssl3_connect(SSL *s)
                        if (ret <= 0) goto end;
 
                        if (s->hit)
                        if (ret <= 0) goto end;
 
                        if (s->hit)

+                               {

                                s->state=SSL3_ST_CR_FINISHED_A;
                                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;
                        else
                                s->state=SSL3_ST_CR_CERT_A;
                        s->init_num=0;