Sync changes between 3.2 and 3.1 branches

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22033)

diff --git a/CHANGES.md b/CHANGES.md
index 974e5494860177be4b5a723c593975016684b1e7..c187fe9e05e85559ebacc8cc2496d26933334742 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -455,6 +455,10 @@ OpenSSL 3.2
 OpenSSL 3.1
 -----------
 
+### Changes between 3.1.2 and 3.1.3 [xx XXX xxxx]
+
+ * none yet
+
 ### Changes between 3.1.1 and 3.1.2 [1 Aug 2023]
 
  * Fix excessive time spent checking DH q parameter value.

diff --git a/NEWS.md b/NEWS.md
index 8a1ca6b97305cee978a9e31267b19b5bd3e065a3..d8de7c8b2bd0720a2afacb2819fcb69a0dc5f7f2 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -52,7 +52,11 @@ OpenSSL 3.2
 OpenSSL 3.1
 -----------
 
-### Major changes between OpenSSL 3.1.1 and OpenSSL 3.1.2 [under development]
+### Major changes between OpenSSL 3.1.2 and OpenSSL 3.1.3 [under development]
+
+  * none
+
+### Major changes between OpenSSL 3.1.1 and OpenSSL 3.1.2 [1 Aug 2023]
 
   * Fix excessive time spent checking DH q parameter value ([CVE-2023-3817])
   * Fix DH_check() excessive time with over sized modulus ([CVE-2023-3446])