Commit a4a90a8a authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7180)
parent fc4e1ab4

CHANGES

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
 https://github.com/openssl/openssl/commits/ and pick the appropriate

 https://github.com/openssl/openssl/commits/ and pick the appropriate

 release branch.

 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]



























  *)







  *)

















































NEWS



+1
−1






























Original line number
Original line
Diff line number
Diff line








@@ -5,7 +5,7 @@









  This file gives a brief overview of the major changes between each OpenSSL







  This file gives a brief overview of the major changes between each OpenSSL











  release. For more details please read the CHANGES file.







  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





















































README



+1
−1






























Original line number
Original line
Diff line number
Diff line































 OpenSSL 1.1.1a-dev







 OpenSSL 1.1.2-dev































 Copyright (c) 1998-2018 The OpenSSL Project







 Copyright (c) 1998-2018 The OpenSSL Project











 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson







 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

































include/openssl/opensslv.h



+2
−2






























Original line number
Original line
Diff line number
Diff line








@@ -39,8 +39,8 @@ extern "C" {









 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for







 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for











 *  major minor fix final patch/beta)







 *  major minor fix final patch/beta)











 */







 */











# define OPENSSL_VERSION_NUMBER  0x10101010L







# define OPENSSL_VERSION_NUMBER  0x10102000L











# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a-dev  xx XXX xxxx"







# 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, ...)