[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c4fb3b3942598fe7a2bed06710ed6e30e4f6f419 (commit)
       via  c2bbf058736b8cb5b32e78a50d1410fa34cc8284 (commit)
      from  c35f5c3d3a557288b6c7dcaa17dbbc5916e3e263 (commit)


- Log -----------------------------------------------------------------
commit c4fb3b3942598fe7a2bed06710ed6e30e4f6f419
Author: Richard Levitte <richard at levitte.org>
Date:   Mon Feb 15 19:37:42 2016 +0100

    Prepare for 1.1.0-pre4-dev
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit c2bbf058736b8cb5b32e78a50d1410fa34cc8284
Author: Richard Levitte <richard at levitte.org>
Date:   Mon Feb 15 19:37:20 2016 +0100

    Prepare for 1.1.0-pre3 release
    
    Reviewed-by: Stephen Henson <steve 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 ead73fc..a0d434f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-pre3-dev
+ OpenSSL 1.1.0-pre4-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 da093d6..05ea50d 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  0x10100003L
+# define OPENSSL_VERSION_NUMBER  0x10100004L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre3-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre4-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre3-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre4-dev  xx XXX xxxx"
 # endif
 
 /*-