diff options
| author | Emilia Kasper <emilia@openssl.org> | 2014-11-19 15:42:43 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-11-20 15:09:45 +0100 |
| commit | ce5f32cfa717fa3bbc13b99974b57bd8660e454a (patch) | |
| tree | d024170e5b9ef2cb2025d8950967b8b115c1dc36 /ssl/s3_clnt.c | |
| parent | 5891c226d8c156462337c284c900f33a57bf6a84 (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>
(cherry picked from commit a06cd5d056c6a5b1d161786873e21a5e53d554d8)
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 3c270fee2d..16a39c824b 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: |