Commit ffb1e659 authored Feb 16, 2017 by Matt Caswell

Prepare for 1.1.0f-dev



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

parent 0453163e

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@
		OpenSSL CHANGES
		_______________

		Changes between 1.1.0e and 1.1.0f [xx XXX xxxx]

		*)

		Changes between 1.1.0d and 1.1.0e [16 Feb 2017]

		*) Encrypt-Then-Mac renegotiation crash

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

		o

		Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017]

		o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733)

README

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL 1.1.0e 16 Feb 2017
		OpenSSL 1.1.0f-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 0x1010005fL
		# define OPENSSL_VERSION_NUMBER 0x10100060L
		# ifdef OPENSSL_FIPS
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips 16 Feb 2017"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f-fips-dev xx XXX xxxx"
		# else
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e 16 Feb 2017"
		# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f-dev xx XXX xxxx"
		# endif

		/*-