Commit b403cc38 authored Mar 27, 2018 by Matt Caswell

Prepare for 1.1.0i-dev



Reviewed-by: Richard Levitte <levitte@openssl.org>

parent d4e4bd2a

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,10 @@
		https://github.com/openssl/openssl/commits/ and pick the appropriate
		release branch.

		Changes between 1.1.0h and 1.1.0i [xx XXX xxxx]

		*)

		Changes between 1.1.0g and 1.1.0h [27 Mar 2018]

		*) Constructed ASN.1 types with a recursive definition could exceed the stack

NEWS

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@
		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.0h and OpenSSL 1.1.0i [under development]

		o

		Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [27 Mar 2018]

		o Constructed ASN.1 types with a recursive definition could exceed the

README

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL 1.1.0h 27 Mar 2018
		OpenSSL 1.1.0i-dev

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

include/openssl/opensslv.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,11 +39,11 @@ 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 0x1010008fL
		# define OPENSSL_VERSION_NUMBER 0x10100090L
		# ifdef OPENSSL_FIPS
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips 27 Mar 2018"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0i-fips-dev xx XXX xxxx"
		# else
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h 27 Mar 2018"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0i-dev xx XXX xxxx"
		# endif

		#define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch)