From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 3 Sep 2024 10:24:58 +0000 (+0200)
Subject: Add CVE-2024-5535 to CHANGES and NEWS
X-Git-Tag: openssl-3.1.7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b63375e48b452de14caa6bcd83ddacdb49093e77;p=thirdparty%2Fopenssl.git

Add CVE-2024-5535 to CHANGES and NEWS

Reviewed-by: Neil Horman <nhorman@openssl.org>
Release: yes
(cherry picked from commit 0c3d66a46eda9353f80e1846642b9090a8eac999)
---

diff --git a/CHANGES.md b/CHANGES.md
index 90ecaa0921b..e9c6f243734 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,10 +32,20 @@ OpenSSL 3.1
    an X.509 certificate. This may result in an exception that terminates the
    application program.
 
-   [(CVE-2024-6119)]
+   ([CVE-2024-6119])
 
    *Viktor Dukhovni*
 
+ * Fixed possible buffer overread in SSL_select_next_proto().
+
+   Calling the OpenSSL API function SSL_select_next_proto with an empty
+   supported client protocols buffer may cause a crash or memory contents
+   to be sent to the peer.
+
+   ([CVE-2024-5535])
+
+   *Matt Caswell*
+
 ### Changes between 3.1.5 and 3.1.6 [4 Jun 2024]
 
  * Fixed potential use after free after SSL_free_buffers() is called.
@@ -20037,6 +20047,7 @@ ndif
 <!-- Links -->
 
 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119
+[CVE-2024-5535]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-5535
 [CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741
 [CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603
 [CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511
diff --git a/NEWS.md b/NEWS.md
index ce2b5b59d9e..4142e26a72e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,10 +21,16 @@ OpenSSL 3.1
 
 ### Major changes between OpenSSL 3.1.6 and OpenSSL 3.1.7 [under development]
 
-OpenSSL 3.3.2 is a security patch release. The most severe CVE fixed in this
+OpenSSL 3.1.7 is a security patch release. The most severe CVE fixed in this
 release is Moderate.
 
-  * Fixed possible denial of service in X.509 name checks [(CVE-2024-6119)].
+This release incorporates the following bug fixes and mitigations:
+
+  * Fixed possible denial of service in X.509 name checks
+    ([CVE-2024-6119])
+
+  * Fixed possible buffer overread in SSL_select_next_proto()
+    ([CVE-2024-5535])
 
 ### Major changes between OpenSSL 3.1.5 and OpenSSL 3.1.6 [4 Jun 2024]
 
@@ -1506,6 +1512,7 @@ OpenSSL 0.9.x
 <!-- Links -->
 
 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119
+[CVE-2024-5535]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-5535
 [CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741
 [CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603
 [CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511