From: Dr. Stephen Henson Date: Thu, 5 Jun 2014 09:42:13 +0000 (+0100) Subject: Prepare for 1.0.0m release X-Git-Tag: OpenSSL_1_0_0m^0 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bee980bb5d8f751a3a0500e6979983e40fd1bea;p=oweals%2Fopenssl.git Prepare for 1.0.0m release --- diff --git a/CHANGES b/CHANGES index 82aa7aeb7b..12566e5904 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.0l and 1.0.0m [xx XXX xxxx] + Changes between 1.0.0l and 1.0.0m [5 Jun 2014] *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted handshake can force the use of weak keying material in OpenSSL diff --git a/NEWS b/NEWS index a2231a2aa6..5a9afa35a8 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.0l and OpenSSL 1.0.0m [under development] + Major changes between OpenSSL 1.0.0l and OpenSSL 1.0.0m [5 Jun 2014] o Fix for CVE-2014-0224 o Fix for CVE-2014-0221 diff --git a/README b/README index 25559b82b7..9f3bae00de 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.0m-dev + OpenSSL 1.0.0m 5 Jun 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/opensslv.h b/crypto/opensslv.h index 3118785cbd..265a0054b4 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x100000d0L +#define OPENSSL_VERSION_NUMBER 0x100000dfL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-fips-dev xx XXX xxxx" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-fips 5 Jun 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m-dev xx XXX xxxx" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0m 5 Jun 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT