[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c60ebfdc0860458e2a24d86760a7d686cfe1f995 (commit)
       via  bd31d02e412f80f53073a1eb776dffe06ac91746 (commit)
       via  58add8967f92a0b682da287cc885f963648d9a69 (commit)
      from  fbd03b0964329fa43f84b99a19b1ee98e8ad190c (commit)


- Log -----------------------------------------------------------------
commit c60ebfdc0860458e2a24d86760a7d686cfe1f995
Author: Richard Levitte <richard at levitte.org>
Date:   Thu Jan 14 15:27:14 2016 +0100

    Prepare for 1.1.0-pre3-dev
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit bd31d02e412f80f53073a1eb776dffe06ac91746
Author: Richard Levitte <richard at levitte.org>
Date:   Thu Jan 14 15:26:56 2016 +0100

    Prepare for 1.1.0-pre2 release
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 58add8967f92a0b682da287cc885f963648d9a69
Author: Richard Levitte <richard at levitte.org>
Date:   Thu Jan 14 15:13:50 2016 +0100

    Change the last copyright year to 2016 in README
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/README b/README
index df8d335..8785b0c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
- OpenSSL 1.1.0-pre2-dev
+ OpenSSL 1.1.0-pre3-dev
 
- Copyright (c) 1998-2015 The OpenSSL Project
+ Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 3aee5e2..da093d6 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  0x10100002L
+# define OPENSSL_VERSION_NUMBER  0x10100003L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre2-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre3-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre2-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre3-dev  xx XXX xxxx"
 # endif
 
 /*-