The next version in master is at least 1.1.2, not 1.1.1x

The OMC hasn't yet decided what the next release version will be, but
it's at least going to 1.1.2, so we set that value for the moment.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7180)

diff --git a/CHANGES b/CHANGES
index 0499bd50d36c281753f956121e0e243e50b31a0b..abb03b4e4b30a8df4eca8e5d364adfd69988b427 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 

- Changes between 1.1.1 and 1.1.1a [xx XXX xxxx]
+ Changes between 1.1.1 and 1.1.2 [xx XXX xxxx]

 
   *)
 
 
   *)
 

diff --git a/NEWS b/NEWS
index 4026385dd7fc926783d4a224c6ec5e182a91b458..3179b1dd2418268521a19d61f83ebf1c4b783202 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 

-  Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.1a [under development]
+  Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.2 [under development]

 
       o
 
 
       o
 

diff --git a/README b/README
index 5817b544a0b221eea2e566793e29f4dacaa85bce..6818807a4cbd1aaa454c7adf005bbc9519ea05a7 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
 

- OpenSSL 1.1.1a-dev
+ OpenSSL 1.1.2-dev

 
  Copyright (c) 1998-2018 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 
  Copyright (c) 1998-2018 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 2a54f2c9c9f58a834ad8a491738374024915e02d..f22601adcd3f41178f6cd8b306b107562dd5c26f 100644 (file)
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */

-# define OPENSSL_VERSION_NUMBER  0x10101010L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10102000L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.2-dev  xx XXX xxxx"

 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)