From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 14 Dec 2015 14:15:45 +0000 (+0000)
Subject: make update
X-Git-Tag: OpenSSL_1_1_0-pre2~226
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=6745fcf62784005edd5532c009e789440b8d8964

make update

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 7b1dd569fe..44da77f3e0 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: ../../include/openssl/async.h ../../include/openssl/crypto.h
-arch/async_null.o: ../../include/openssl/e_os2.h
+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/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: ../../include/openssl/async.h
+arch/async_posix.o: ../../e_os.h ../../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: ../../include/openssl/async.h ../../include/openssl/crypto.h
-arch/async_win.o: ../../include/openssl/e_os2.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
@@ -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: ../../include/openssl/async.h ../../include/openssl/bio.h
+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
 async.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/util/libeay.num b/util/libeay.num
index 7e0ae75c73..fb94dc87c3 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4732,3 +4732,10 @@ TLS_FEATURE_new                         5094	EXIST::FUNCTION:
 EVP_ENCODE_CTX_free                     5095	EXIST::FUNCTION:
 EVP_ENCODE_CTX_num                      5096	EXIST::FUNCTION:
 EVP_ENCODE_CTX_new                      5097	EXIST::FUNCTION:
+EVP_PKEY_up_ref                         5098	EXIST::FUNCTION:
+EVP_PKEY_get0_EC_KEY                    5099	EXIST::FUNCTION:EC
+EVP_PKEY_get0_DSA                       5100	EXIST::FUNCTION:DSA
+EVP_PKEY_get0_DH                        5101	EXIST::FUNCTION:DH
+X509_get0_pubkey                        5102	EXIST::FUNCTION:
+X509_PUBKEY_get0                        5103	EXIST::FUNCTION:
+EVP_PKEY_get0_RSA                       5104	EXIST::FUNCTION:RSA