Commit 4bee980b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Prepare for 1.0.0m release

parent 7fa54285
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line

 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
+3 −3
Original line number Diff line number Diff line
@@ -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