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:20:16 +0100 |
| commit | e2f69f5ce7aa36d98e3b24c2afe8be561226659c (patch) | |
| tree | cfed8efa8130a6c1a86720b208373fd975ab45a6 /ssl/t1_lib.c | |
| parent | 821bee4333f4d4e72390f18b39a23e9a93d8b2d9 (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index f5728c28d9..c7032f717d 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1513,6 +1513,7 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in #ifndef OPENSSL_NO_NEXTPROTONEG s->s3->next_proto_neg_seen = 0; #endif + s->tlsext_ticket_expected = 0; #ifndef OPENSSL_NO_HEARTBEATS s->tlsext_heartbeat &= ~(SSL_TLSEXT_HB_ENABLED | |