[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a4a90a8a3bdcb9336b5c9c15da419e99a87bc6ed (commit)
      from  fc4e1ab4708a3eb87a107df7e085d0d8125c5171 (commit)


- Log -----------------------------------------------------------------
commit a4a90a8a3bdcb9336b5c9c15da419e99a87bc6ed
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 11 16:23:22 2018 +0200

    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 at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7180)

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                    | 2 +-
 NEWS                       | 2 +-
 README                     | 2 +-
 include/openssl/opensslv.h | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0499bd5..abb03b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
  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 4026385..3179b1d 100644
--- 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.
 
-  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
 
diff --git a/README b/README
index 5817b54..6818807 100644
--- 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
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 2a54f2c..f22601a 100644
--- 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)
  */
-# 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, ...)