[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b83fb854da7ab6b61c3ec62372cfb857987107fd (commit)
      from  cc99bfa76bd25e40672841c78db9cc171be5488b (commit)


- Log -----------------------------------------------------------------
commit b83fb854da7ab6b61c3ec62372cfb857987107fd
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Nov 23 15:00:10 2015 -0500

    "make update" after async merge.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 crypto/async/Makefile | 12 ++++++++++--
 crypto/rand/Makefile  | 18 +++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 2589b1a..44da77f 100644
--- a/crypto/async/Makefile
+++ b/crypto/async/Makefile
@@ -97,8 +97,16 @@ 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: ../../include/openssl/async.h arch/async_win.c
-arch/async_win.o: arch/async_win.h
+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/opensslconf.h
+arch/async_win.o: ../../include/openssl/opensslv.h
+arch/async_win.o: ../../include/openssl/ossl_typ.h
+arch/async_win.o: ../../include/openssl/safestack.h
+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/crypto.h ../../include/openssl/e_os2.h
 async.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile
index a0b1245..782be92 100644
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -63,15 +63,15 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 md_rand.o: ../../e_os.h ../../include/openssl/asn1.h
-md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-md_rand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-md_rand.o: md_rand.c rand_lcl.h
+md_rand.o: ../../include/openssl/async.h ../../include/openssl/bio.h
+md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+md_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+md_rand.o: ../../include/openssl/symhacks.h md_rand.c rand_lcl.h
 rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h
 rand_egd.o: ../../include/openssl/opensslconf.h
 rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h