diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2024-06-20 23:24:17 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2024-06-20 23:24:17 +0000 |
| commit | 1070e7dca8223387baf5155524b28f62bfe7da3c (patch) | |
| tree | eaa96223b0f6fd1e86ecd5165af26a4d85a3fff2 /ssl/statem/statem_srvr.c | |
| parent | 9dd13e84fa8eca8f3462bd55485aa3da8c37f54a (diff) | |
Import OpenSSL 3.0.14vendor/openssl/3.0.14
This release resolves 3 upstream found CVEs:
- Fixed potential use after free after SSL_free_buffers() is called (CVE-2024-4741)
- Fixed an issue where checking excessively long DSA keys or parameters may be very slow (CVE-2024-4603)
- Fixed unbounded memory growth with session handling in TLSv1.3 (CVE-2024-2511)
Diffstat (limited to 'ssl/statem/statem_srvr.c')
| -rw-r--r-- | ssl/statem/statem_srvr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index a9e67f9d32a7..df7c868eff71 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. * @@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt) * so the following won't overwrite an ID that we're supposed * to send back. */ - if (s->session->not_resumable || - (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) - && !s->hit)) + if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) + && !s->hit) s->session->session_id_length = 0; if (usetls13) { @@ -3135,7 +3134,7 @@ static int tls_process_cke_gost(SSL *s, PACKET *pkt) } if (EVP_PKEY_decrypt_init(pkey_ctx) <= 0) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); - return 0; + goto err; } /* * If client certificate is present and is of the same type, maybe |