Commit 1ec574ae authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.1.0d-dev

parent 91eaf079
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@
 OpenSSL CHANGES
 _______________
 Changes between 1.1.0c and 1.1.0d [xx XXX xxxx]
  *)
 Changes between 1.1.0b and 1.1.0c [10 Nov 2016]
  *) ChaCha20/Poly1305 heap-buffer-overflow
+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.0c and OpenSSL 1.1.0d [under development]

      o

  Major changes between OpenSSL 1.1.0b and OpenSSL 1.1.0c [10 Nov 2016]

      o ChaCha20/Poly1305 heap-buffer-overflow (CVE-2016-7054)
+1 −1
Original line number Diff line number Diff line

 OpenSSL 1.1.0c 10 Nov 2016
 OpenSSL 1.1.0d-dev

 Copyright (c) 1998-2016 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
+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  0x1010003fL
# define OPENSSL_VERSION_NUMBER  0x10100040L
# ifdef OPENSSL_FIPS
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c-fips  10 Nov 2016"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0d-fips-dev  xx XXX xxxx"
# else
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c  10 Nov 2016"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0d-dev  xx XXX xxxx"
# endif

/*-