summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2023-09-08 15:21:23 +0200
committerTomas Mraz <tomas@openssl.org>2023-09-11 10:55:51 +0200
commit02f84b02e889fce0033174238cbd0b653ee9af2c (patch)
treee1ffdca983ef862d9c9fcdff22dc55cdb6483bd3
parent285eb1688f05ad477fefc681bf05d0afedc46d40 (diff)
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)
-rw-r--r--CHANGES.md4
-rw-r--r--NEWS.md6
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 974e549486..c187fe9e05 100644
--- 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 8a1ca6b973..d8de7c8b2b 100644
--- 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])