summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2014-11-19 15:42:43 +0100
committerEmilia Kasper <emilia@openssl.org>2014-11-20 15:09:45 +0100
commitce5f32cfa717fa3bbc13b99974b57bd8660e454a (patch)
treed024170e5b9ef2cb2025d8950967b8b115c1dc36 /ssl/t1_lib.c
parent5891c226d8c156462337c284c900f33a57bf6a84 (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/t1_lib.c')
-rw-r--r--ssl/t1_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index f85a0b8c08..160ce7628a 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)
{