diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-04-29 16:41:53 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-04-29 16:41:53 +0000 |
commit | 3c8f315021499e1a7289a16e167a134e62c88297 (patch) | |
tree | 72d62b87644536a3a879393044a281e1bfdac2e8 /ssl | |
parent | 0f2e6366021e25b79f899c468fa19992821899d2 (diff) | |
download | openssl-new-3c8f315021499e1a7289a16e167a134e62c88297.tar.gz |
Support ticket renewal in state machine (not used at present).
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_srvr.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index b83a8d7da4..c031a0f763 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -290,9 +290,18 @@ int ssl3_accept(SSL *s) case SSL3_ST_SW_SRVR_HELLO_B: ret=ssl3_send_server_hello(s); if (ret <= 0) goto end; - +#ifndef OPENSSL_NO_TLSEXT if (s->hit) - s->state=SSL3_ST_SW_CHANGE_A; + { + if (s->tlsext_ticket_expected) + s->state=SSL3_ST_SW_SESSION_TICKET_A; + else + s->state=SSL3_ST_SW_CHANGE_A; + } +#else + if (s->hit) + s->state=SSL3_ST_SW_CHANGE_A; +#endif else s->state=SSL3_ST_SW_CERT_A; s->init_num=0; |