From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 4 Jan 2024 09:07:17 +0000 (+0100)
Subject: Sync CHANGES.md and NEWS.md with 3.2 branch
X-Git-Tag: openssl-3.3.0-alpha1~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dc2b72df76cf21095bd6a34449feb8474d85368;p=thirdparty%2Fopenssl.git

Sync CHANGES.md and NEWS.md with 3.2 branch

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23200)
---

diff --git a/CHANGES.md b/CHANGES.md
index 57507381e13..031c7101f8c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,11 +28,6 @@ OpenSSL 3.3
 
 ### Changes between 3.2 and 3.3 [xx XXX xxxx]
 
- * Disable building QUIC server utility when OpenSSL is configured with
-   `no-apps`
-
-   *Vitalii Koshura*
-
  * The activate and soft_load configuration settings for providers in
    openssl.cnf have been updated to require a value of [1|yes|true|on]
    (in lower or UPPER case) to enable the setting. Conversely a value
@@ -78,6 +73,13 @@ OpenSSL 3.3
 OpenSSL 3.2
 -----------
 
+### Changes between 3.2.0 and 3.2.1 [xx XXX xxxx]
+
+ * Disable building QUIC server utility when OpenSSL is configured with
+   `no-apps`.
+
+   *Vitalii Koshura*
+
 ### Changes between 3.1 and 3.2 [xx XXX xxxx]
 
  * The EVP_PKEY_fromdata function has been augmented to allow for the derivation
diff --git a/NEWS.md b/NEWS.md
index f85a87657c0..6f619a14dea 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -29,7 +29,11 @@ OpenSSL 3.3
 OpenSSL 3.2
 -----------
 
-### Major changes between OpenSSL 3.1 and OpenSSL 3.2 [under development]
+### Major changes between OpenSSL 3.2.0 and OpenSSL 3.2.1 [under development]
+
+  * none
+
+### Major changes between OpenSSL 3.1 and OpenSSL 3.2.0 [23 Nov 2023]
 
 OpenSSL 3.2.0 is a feature release adding significant new functionality to
 OpenSSL.