diff options
| author | Emilia Kasper <emilia@openssl.org> | 2014-11-19 15:42:43 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-11-20 14:57:15 +0100 |
| commit | a06cd5d056c6a5b1d161786873e21a5e53d554d8 (patch) | |
| tree | 7de291ef28fe195dd2063d41cbb33424d212b496 /ssl | |
| parent | 13d568661c14f71b3c6af263e1b60b92be738f57 (diff) | |
Reset s->tlsext_ticket_expected in ssl_scan_serverhello_tlsext.
This ensures that it's zeroed even if the SSL object is reused
(as in ssltest.c). It also ensures that it applies to DTLS, too.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 8 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index c84c662dc8..98d775b91a 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -226,14 +226,6 @@ int ssl3_connect(SSL *s) s->renegotiate=1; s->state=SSL_ST_CONNECT; s->ctx->stats.sess_connect_renegotiate++; -#ifndef OPENSSL_NO_TLSEXT - /* - * If renegotiating, the server may choose to not issue - * a new ticket, so reset the flag. It will be set to - * the right value when parsing ServerHello extensions. - */ - s->tlsext_ticket_expected = 0; -#endif /* break */ case SSL_ST_BEFORE: case SSL_ST_CONNECT: diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 149e7d6e11..86203f1d2a 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2504,6 +2504,7 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char #ifndef OPENSSL_NO_NEXTPROTONEG s->s3->next_proto_neg_seen = 0; #endif + s->tlsext_ticket_expected = 0; if (s->s3->alpn_selected) { |