summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-10-06 14:51:19 +0100
committerMatt Caswell <matt@openssl.org>2015-11-20 23:35:19 +0000
commitc742f56e94176d4274bb31e796e9ea9eb084f60f (patch)
treec09a2353afbf55894faaf9013638ff80e8d37cd3
parent079a1a9014b89661f0a612a5a9724ad9c77f21a3 (diff)
make update
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--crypto/async/Makefile10
-rw-r--r--crypto/err/Makefile42
-rwxr-xr-xutil/libeay.num1
3 files changed, 31 insertions, 22 deletions
diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 1c9482f12e..2589b1a175 100644
--- a/crypto/async/Makefile
+++ b/crypto/async/Makefile
@@ -99,10 +99,18 @@ 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
-async.o: ../../e_os.h ../../include/openssl/async.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
async.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
async.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
async.o: arch/async_null.h arch/async_posix.h arch/async_win.h async.c
async.o: async_locl.h
+async_err.o: ../../include/openssl/async.h ../../include/openssl/bio.h
+async_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+async_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+async_err.o: ../../include/openssl/opensslconf.h
+async_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+async_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+async_err.o: ../../include/openssl/symhacks.h async_err.c
diff --git a/crypto/err/Makefile b/crypto/err/Makefile
index dcd7347865..398b3b9e08 100644
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -67,27 +67,27 @@ err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
err.o: ../include/internal/cryptlib.h err.c
-err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-err_all.o: ../../include/openssl/cms.h ../../include/openssl/comp.h
-err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
-err_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
-err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h
-err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-err_all.o: ../../include/openssl/ts.h ../../include/openssl/ui.h
-err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-err_all.o: ../../include/openssl/x509v3.h ../include/internal/ct_int.h
-err_all.o: err_all.c
+err_all.o: ../../include/openssl/asn1.h ../../include/openssl/async.h
+err_all.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+err_all.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+err_all.o: ../../include/openssl/comp.h ../../include/openssl/conf.h
+err_all.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
+err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+err_all.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+err_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
+err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
+err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+err_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+err_all.o: ../include/internal/ct_int.h err_all.c
err_prn.o: ../../e_os.h ../../include/openssl/bio.h
err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/util/libeay.num b/util/libeay.num
index 68094830d9..82ab47721e 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4660,3 +4660,4 @@ ASYNC_wake 5019 EXIST::FUNCTION:
ASYNC_clear_wake 5020 EXIST::FUNCTION:
ASYNC_get_current_job 5021 EXIST::FUNCTION:
ASYNC_get_wait_fd 5022 EXIST::FUNCTION:
+ERR_load_ASYNC_strings 5023 EXIST::FUNCTION: