From 5dd94f1847c744929a3bd24819f1c99644bb18c7 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 3 May 2016 14:46:41 +0100 Subject: [PATCH] Prepare for 1.0.2h release Reviewed-by: Rich Salz --- CHANGES | 2 +- NEWS | 2 +- README | 2 +- crypto/opensslv.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index a07d8fe7c5..4a557652d5 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.2g and 1.0.2h [xx XXX xxxx] + Changes between 1.0.2g and 1.0.2h [3 May 2016] *) Prevent padding oracle in AES-NI CBC MAC check diff --git a/NEWS b/NEWS index e8f1d06abb..6c85116fc8 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.0.2g and OpenSSL 1.0.2h [under development] + Major changes between OpenSSL 1.0.2g and OpenSSL 1.0.2h [3 May 2016] o Prevent padding oracle in AES-NI CBC MAC check (CVE-2016-2107) o Fix EVP_EncodeUpdate overflow (CVE-2016-2105) diff --git a/README b/README index bb2e4c6409..b880eec2d4 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.2h-dev + OpenSSL 1.0.2h 3 May 2016 Copyright (c) 1998-2015 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/opensslv.h b/crypto/opensslv.h index d6d671a4e9..13fe440231 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -30,11 +30,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 0x10002080L +# define OPENSSL_VERSION_NUMBER 0x1000208fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2h-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2h-fips 3 May 2016" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2h-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2h 3 May 2016" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT -- 2.25.1