The next version to be released from master is 4.0

Now that the 3.6 branch has been created, correct the master branch so
that it is clear that the next release from that branch will be 4.0

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28423)

diff --git a/CHANGES.md b/CHANGES.md
index c512e17ddbe75343b2e790acf49da3f87c1ca552..957a13dd1852eee8249c3344cb34e2d757fd2971 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ appropriate release branch.
 OpenSSL Releases
 ----------------
 
+ - [OpenSSL 4.0](#openssl-40)
  - [OpenSSL 3.6](#openssl-36)
  - [OpenSSL 3.5](#openssl-35)
  - [OpenSSL 3.4](#openssl-34)
@@ -26,13 +27,16 @@ OpenSSL Releases
  - [OpenSSL 1.0.0](#openssl-100)
  - [OpenSSL 0.9.x](#openssl-09x)
 
-OpenSSL 3.6
+OpenSSL 4.0
 -----------
 
-### Changes between 3.6 and 3.7 [xx XXX xxxx]
+### Changes between 3.6 and 4.0 [xx XXX xxxx]
 
  * none yet
 
+OpenSSL 3.6
+-----------
+
 ### Changes between 3.5 and 3.6 [xx XXX xxxx]
 
  * Added support for EVP_SKEY opaque symmetric key objects to the key

diff --git a/NEWS.md b/NEWS.md
index 1e70165d5b4f97a86a260f3defcaa67362e50332..9b1f96bdf74b80a05f7cb47fd7bc7d02da7e62c0 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -7,6 +7,7 @@ release. For more details please read the CHANGES file.
 OpenSSL Releases
 ----------------
 
+ - [OpenSSL 4.0](#openssl-40)
  - [OpenSSL 3.6](#openssl-36)
  - [OpenSSL 3.5](#openssl-35)
  - [OpenSSL 3.4](#openssl-34)
@@ -21,13 +22,16 @@ OpenSSL Releases
  - [OpenSSL 1.0.0](#openssl-100)
  - [OpenSSL 0.9.x](#openssl-09x)
 
-OpenSSL 3.6
+OpenSSL 4.0
 -----------
 
-### Major changes between OpenSSL 3.6 and OpenSSL 3.7 [under development]
+### Major changes between OpenSSL 3.6 and OpenSSL 4.0 [under development]
 
   * none
 
+OpenSSL 3.6
+-----------
+
 ### Major changes between OpenSSL 3.5 and OpenSSL 3.6 [under development]
 
 This release incorporates the following potentially significant or incompatible

diff --git a/VERSION.dat b/VERSION.dat
index 2853f3b1c5c73edf2f7d8835730f3b5bec9f753d..def9fedb1cfe5d829882eca8ad41f40684ab09c1 100644 (file)
--- a/VERSION.dat
+++ b/VERSION.dat
@@ -1,7 +1,7 @@
-MAJOR=3
-MINOR=7
+MAJOR=4
+MINOR=0
 PATCH=0
 PRE_RELEASE_TAG=dev
 BUILD_METADATA=
 RELEASE_DATE=""
-SHLIB_VERSION=3
+SHLIB_VERSION=4