Fix from stable branch.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 3 Nov 2007 13:09:34 +0000 (13:09 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 3 Nov 2007 13:09:34 +0000 (13:09 +0000)
ssl/s3_clnt.c

index 8141a5c..09883ea 100644 (file)
@@ -295,7 +295,10 @@ int ssl3_connect(SSL *s)
                        if (ret == 2)
                                {
                                s->hit = 1;
-                               s->state=SSL3_ST_CR_FINISHED_A;
+                               if (s->tlsext_ticket_expected)
+                                       s->state=SSL3_ST_CR_SESSION_TICKET_A;
+                               else
+                                       s->state=SSL3_ST_CR_FINISHED_A;
                                s->init_num=0;
                                break;
                                }