aboutsummaryrefslogtreecommitdiff
path: root/ssl/s3_clnt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2007-11-03 13:09:34 +0000
committerDr. Stephen Henson <steve@openssl.org>2007-11-03 13:09:34 +0000
commit31f528b15de7bc2afbbdc592973a3a50da9b1629 (patch)
tree9a74b0a8d1294776351db6702c570d4a06a4dbd5 /ssl/s3_clnt.c
parent86140095b55272f06feaf4b3a9ae7e68c13af458 (diff)
downloadopenssl-31f528b15de7bc2afbbdc592973a3a50da9b1629.zip
openssl-31f528b15de7bc2afbbdc592973a3a50da9b1629.tar.gz
openssl-31f528b15de7bc2afbbdc592973a3a50da9b1629.tar.bz2
Fix from stable branch.
Diffstat (limited to 'ssl/s3_clnt.c')
-rw-r--r--ssl/s3_clnt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 8141a5c..09883ea 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -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;
}