Commit 577d7010 authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.1.0f release

parent 058253ad
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
 OpenSSL CHANGES
 _______________
 Changes between 1.1.0e and 1.1.0f [xx XXX xxxx]
 Changes between 1.1.0e and 1.1.0f [25 May 2017]
  *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target
     platform rather than 'mingw'.
+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.0e and OpenSSL 1.1.0f [under development]
  Major changes between OpenSSL 1.1.0e and OpenSSL 1.1.0f [25 May 2017]

      o config now recognises 64-bit mingw and chooses mingw64 instead of mingw

+1 −1
Original line number Diff line number Diff line

 OpenSSL 1.1.0f-dev
 OpenSSL 1.1.0f 25 May 2017

 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  0x10100060L
# define OPENSSL_VERSION_NUMBER  0x1010006fL
# ifdef OPENSSL_FIPS
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips-dev  xx XXX xxxx"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips  25 May 2017"
# else
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-dev  xx XXX xxxx"
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f  25 May 2017"
# endif

/*-