Commit fcc8edbd98 for openssl.org
commit fcc8edbd982d96f1fca59abdb94dc14ff57d9074
Author: openssl-machine <openssl-machine@openssl.org>
Date: Tue Apr 14 12:04:16 2026 +0000
Forward port release update commit to master branch
Bring NEWS.md/CHANGES.md into line with updates on the 4.0 branch
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Thu Apr 16 16:27:47 2026
(Merged from https://github.com/openssl/openssl/pull/30830)
diff --git a/CHANGES.md b/CHANGES.md
index 2b55f6ebdf..4fa0eebf3c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -105,7 +105,7 @@ OpenSSL Releases
*Helen Zhang*
-### Changes between 3.6 and 4.0 [xx XXX xxxx]
+### Changes between 3.6 and 4.0.0 [14 Apr 2026]
* Added `-expected-rpks` option to the `openssl s_client`
and `openssl s_server` commands. This makes it possible to specify
diff --git a/NEWS.md b/NEWS.md
index 7abd5c5f65..494ca0fe67 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -7,6 +7,7 @@ release. For more details please read the CHANGES file.
OpenSSL Releases
----------------
+ - [OpenSSL 4.1](#openssl-41)
- [OpenSSL 4.0](#openssl-40)
- [OpenSSL 3.6](#openssl-36)
- [OpenSSL 3.5](#openssl-35)
@@ -22,7 +23,7 @@ OpenSSL Releases
- [OpenSSL 1.0.0](#openssl-100)
- [OpenSSL 0.9.x](#openssl-09x)
-OpenSSL 4.0
+OpenSSL 4.1
-----------
### Major changes between OpenSSL 4.0 and OpenSSL 4.1 [under development]
@@ -30,7 +31,10 @@ OpenSSL 4.0
* API calls `CRYPTO_atomic_load_ptr`, `CRYPTO_atomic_store_ptr`, and
`CRYPTO_atomic_cmp_exch_ptr` have been added.
-### Major changes between OpenSSL 3.6 and OpenSSL 4.0 [under development]
+OpenSSL 4.0
+-----------
+
+### Major changes between OpenSSL 3.6 and OpenSSL 4.0.0 [14 Apr 2026]
OpenSSL 4.0.0 is a feature release adding significant new functionality
to OpenSSL.