[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  37d42aae2e40354ee0c5e077f09c8aed5b3132d2 (commit)
       via  e711d13af3e3bee1c6423c27eeb48ad4921d4fc3 (commit)
      from  c521edc3a12042701b2dda93e6bb9855e351c929 (commit)


- Log -----------------------------------------------------------------
commit 37d42aae2e40354ee0c5e077f09c8aed5b3132d2
Author: Richard Levitte <richard at levitte.org>
Date:   Wed Mar 16 18:21:46 2016 +0100

    Prepare for 1.1.0-pre5-dev
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

commit e711d13af3e3bee1c6423c27eeb48ad4921d4fc3
Author: Richard Levitte <richard at levitte.org>
Date:   Wed Mar 16 18:21:17 2016 +0100

    Prepare for 1.1.0-pre4 release
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 README                     | 2 +-
 include/openssl/opensslv.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index a0d434f..3e291d2 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-pre4-dev
+ OpenSSL 1.1.0-pre5-dev
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 9a06bdd..d85d1f3 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -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  0x10100004L
+# define OPENSSL_VERSION_NUMBER  0x10100005L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre4-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre5-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre4-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre5-dev  xx XXX xxxx"
 # endif
 
 /*-