Commit d4e4bd2a authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.1.0h release

parent f520f134
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
 https://github.com/openssl/openssl/commits/ and pick the appropriate
 release branch.
 Changes between 1.1.0g and 1.1.0h [xx XXX xxxx]
 Changes between 1.1.0g and 1.1.0h [27 Mar 2018]
  *) Constructed ASN.1 types with a recursive definition could exceed the stack
+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.1.0g and OpenSSL 1.1.0h [under development]
  Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [27 Mar 2018]

      o Constructed ASN.1 types with a recursive definition could exceed the
        stack (CVE-2018-0739)
+1 −1
Original line number Diff line number Diff line

 OpenSSL 1.1.0h-dev
 OpenSSL 1.1.0h 27 Mar 2018

 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  0x10100080L
# define OPENSSL_VERSION_NUMBER  0x1010008fL
# ifdef OPENSSL_FIPS
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0h-fips-dev  xx XXX xxxx"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0h-fips  27 Mar 2018"
# else
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0h-dev  xx XXX xxxx"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0h  27 Mar 2018"
# endif

#define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch)