Commit 38225393 authored Nov 02, 2017 by Matt Caswell

Prepare for 1.1.0h-dev



Reviewed-by: Andy Polyakov <appro@openssl.org>

parent b2758a22

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.0g and 1.1.0h [xx XXX xxxx]

		*)

		Changes between 1.1.0f and 1.1.0g [2 Nov 2017]

		*) bn_sqrx8x_internal carry bug on x86_64

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.0g and OpenSSL 1.1.0h [under development]

		o

		Major changes between OpenSSL 1.1.0f and OpenSSL 1.1.0g [2 Nov 2017]

		o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736)

README

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL 1.1.0g 2 Nov 2017
		OpenSSL 1.1.0h-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 0x1010007fL
		# define OPENSSL_VERSION_NUMBER 0x10100080L
		# ifdef OPENSSL_FIPS
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0g-fips 2 Nov 2017"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips-dev xx XXX xxxx"
		# else
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0g 2 Nov 2017"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-dev xx XXX xxxx"
		# endif

		/*-