[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  278d6b3663da7f02f294481694e2bd909eb4672f (commit)
       via  22c21b60afb33bf32f91560e7c29c21588429420 (commit)
       via  ac7f47dce13bf82d1279c0fe2affa07afbe81e06 (commit)
       via  b0cae88cc22bf9e14510553b2cd663b701b02af7 (commit)
      from  e7986647267b689c88b079bd4277facca9720fc1 (commit)


- Log -----------------------------------------------------------------
commit 278d6b3663da7f02f294481694e2bd909eb4672f
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Dec 10 14:24:22 2015 +0000

    Prepare for 1.1.0-pre2-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 22c21b60afb33bf32f91560e7c29c21588429420
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Dec 10 14:23:10 2015 +0000

    Prepare for 1.1.0-pre1 release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit ac7f47dce13bf82d1279c0fe2affa07afbe81e06
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Dec 10 14:21:59 2015 +0000

    OpenSSL 1.1.0 is now in pre release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit b0cae88cc22bf9e14510553b2cd663b701b02af7
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Dec 10 14:21:59 2015 +0000

    make update
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/NEWS b/NEWS
index 4c4e7b4..ab7b2af 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/README b/README
index cc20f57..a8235dc 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-dev
+ OpenSSL 1.1.0-pre2-dev
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 44da77f..7b1dd56 100644
--- a/crypto/async/Makefile
+++ b/crypto/async/Makefile
@@ -76,8 +76,8 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-arch/async_null.o: ../../e_os.h ../../include/openssl/async.h
-arch/async_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+arch/async_null.o: ../../include/openssl/async.h ../../include/openssl/crypto.h
+arch/async_null.o: ../../include/openssl/e_os2.h
 arch/async_null.o: ../../include/openssl/opensslconf.h
 arch/async_null.o: ../../include/openssl/opensslv.h
 arch/async_null.o: ../../include/openssl/ossl_typ.h
@@ -86,7 +86,7 @@ arch/async_null.o: ../../include/openssl/stack.h
 arch/async_null.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h
 arch/async_null.o: arch/../arch/async_posix.h arch/../arch/async_win.h
 arch/async_null.o: arch/../async_locl.h arch/async_null.c
-arch/async_posix.o: ../../e_os.h ../../include/openssl/async.h
+arch/async_posix.o: ../../include/openssl/async.h
 arch/async_posix.o: ../../include/openssl/crypto.h
 arch/async_posix.o: ../../include/openssl/e_os2.h
 arch/async_posix.o: ../../include/openssl/opensslconf.h
@@ -97,8 +97,8 @@ arch/async_posix.o: ../../include/openssl/stack.h
 arch/async_posix.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h
 arch/async_posix.o: arch/../arch/async_posix.h arch/../arch/async_win.h
 arch/async_posix.o: arch/../async_locl.h arch/async_posix.c
-arch/async_win.o: ../../e_os.h ../../include/openssl/async.h
-arch/async_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+arch/async_win.o: ../../include/openssl/async.h ../../include/openssl/crypto.h
+arch/async_win.o: ../../include/openssl/e_os2.h
 arch/async_win.o: ../../include/openssl/opensslconf.h
 arch/async_win.o: ../../include/openssl/opensslv.h
 arch/async_win.o: ../../include/openssl/ossl_typ.h
@@ -107,7 +107,7 @@ arch/async_win.o: ../../include/openssl/stack.h
 arch/async_win.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h
 arch/async_win.o: arch/../arch/async_posix.h arch/../arch/async_win.h
 arch/async_win.o: arch/../async_locl.h arch/async_win.c
-async.o: ../../e_os.h ../../include/openssl/async.h ../../include/openssl/bio.h
+async.o: ../../include/openssl/async.h ../../include/openssl/bio.h
 async.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 async.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 async.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 5b6abdf..3aee5e2 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  0x10100000L
+# define OPENSSL_VERSION_NUMBER  0x10100002L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre2-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre2-dev  xx XXX xxxx"
 # endif
 
 /*-