summaryrefslogtreecommitdiffstats
path: root/ssl/s3_clnt.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2011-09-05 13:36:55 +0000
committerBodo Möller <bodo@openssl.org>2011-09-05 13:36:55 +0000
commit3c3f0259238594d77264a78944d409f2127642c4 (patch)
treea9dfe4eb770f2fef8ea67431fc27233966225540 /ssl/s3_clnt.c
parent5ff6e2dfbbc222296d2eec592412042e4c5389af (diff)
Fix session handling.
Diffstat (limited to 'ssl/s3_clnt.c')
-rw-r--r--ssl/s3_clnt.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 22be653f59..6cf6e6f378 100644
--- 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)
+ {
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;