diff options
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index ddab394db9..bcf5108975 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.111 2021/09/03 13:18:17 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.112 2021/10/23 08:13:02 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1789,16 +1789,13 @@ ssl3_get_new_session_ticket(SSL *s) | |||
1789 | 1789 | ||
1790 | CBS_init(&cbs, s->internal->init_msg, n); | 1790 | CBS_init(&cbs, s->internal->init_msg, n); |
1791 | if (!CBS_get_u32(&cbs, &lifetime_hint) || | 1791 | if (!CBS_get_u32(&cbs, &lifetime_hint) || |
1792 | #if UINT32_MAX > LONG_MAX | ||
1793 | lifetime_hint > LONG_MAX || | ||
1794 | #endif | ||
1795 | !CBS_get_u16_length_prefixed(&cbs, &session_ticket) || | 1792 | !CBS_get_u16_length_prefixed(&cbs, &session_ticket) || |
1796 | CBS_len(&cbs) != 0) { | 1793 | CBS_len(&cbs) != 0) { |
1797 | al = SSL_AD_DECODE_ERROR; | 1794 | al = SSL_AD_DECODE_ERROR; |
1798 | SSLerror(s, SSL_R_LENGTH_MISMATCH); | 1795 | SSLerror(s, SSL_R_LENGTH_MISMATCH); |
1799 | goto fatal_err; | 1796 | goto fatal_err; |
1800 | } | 1797 | } |
1801 | s->session->tlsext_tick_lifetime_hint = (long)lifetime_hint; | 1798 | s->session->tlsext_tick_lifetime_hint = lifetime_hint; |
1802 | 1799 | ||
1803 | if (!CBS_stow(&session_ticket, &s->session->tlsext_tick, | 1800 | if (!CBS_stow(&session_ticket, &s->session->tlsext_tick, |
1804 | &s->session->tlsext_ticklen)) { | 1801 | &s->session->tlsext_ticklen)) { |