Commit d9b6a51e authored by Richard Levitte's avatar Richard Levitte
Browse files

Prepare for 1.1.0l-dev

parent fb83aaf6
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@
 https://github.com/openssl/openssl/commits/ and pick the appropriate
 release branch.
 Changes between 1.1.0k and 1.1.0l [xx XXX xxxx]
  *)
 Changes between 1.1.0j and 1.1.0k [28 May 2019]
  *) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
+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.0k and OpenSSL 1.1.0l [under development]

      o

  Major changes between OpenSSL 1.1.0j and OpenSSL 1.1.0k [28 May 2019]

      o Prevent over long nonces in ChaCha20-Poly1305 (CVE-2019-1543)
+1 −1
Original line number Diff line number Diff line

 OpenSSL 1.1.0k 28 May 2019
 OpenSSL 1.1.0l-dev

 Copyright (c) 1998-2018 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  0x101000bfL
# define OPENSSL_VERSION_NUMBER  0x101000c0L
# ifdef OPENSSL_FIPS
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k-fips  28 May 2019"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0l-fips-dev  xx XXX xxxx"
# else
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k  28 May 2019"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0l-dev  xx XXX xxxx"
# endif

/*-