From ce5f32cfa717fa3bbc13b99974b57bd8660e454a Mon Sep 17 00:00:00 2001 From: Emilia Kasper Date: Wed, 19 Nov 2014 15:42:43 +0100 Subject: [PATCH] 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 (cherry picked from commit a06cd5d056c6a5b1d161786873e21a5e53d554d8) --- ssl/s3_clnt.c | 8 -------- ssl/t1_lib.c | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 3c270fee2..16a39c824 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 f85a0b8c0..160ce7628 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2560,6 +2560,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) {