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

OpenSSL 1.1.0 is now in pre release 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b0cae88c

NEWS

+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.2e and OpenSSL 1.1.0 [under development]

  Major changes between OpenSSL 1.0.2e and OpenSSL 1.1.0 [in pre-release]



      o Support for ChaCha20 and Poly1305 added to libcrypto and libssl

      o Support for extended master secret

README

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


 OpenSSL 1.1.0-dev

 OpenSSL 1.1.0-pre1-dev (alpha)



 Copyright (c) 1998-2015 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

include/openssl/opensslv.h

+3 −3
Original line number Diff line number Diff line
@@ -30,11 +30,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  0x10100000L

# define OPENSSL_VERSION_NUMBER  0x10100001L

# ifdef OPENSSL_FIPS

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-fips-dev xx XXX xxxx"

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre1-fips-dev (alpha) xx XXX xxxx"

# else

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-dev xx XXX xxxx"

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre1-dev (alpha) xx XXX xxxx"

# endif



/*-