make update

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/Makefile b/apps/Makefile
index a6d931c91c842ea7fc7387cc7d53dd04bae5720d..58c3d0067ed2d3e715e9ab17799c4af974f7011c 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -780,28 +780,28 @@ s_cb.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 s_cb.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 s_cb.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 s_cb.o: ../include/openssl/x509v3.h apps.h progs.h s_apps.h s_cb.c
-s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h
-s_client.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
-s_client.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-s_client.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-s_client.o: ../include/openssl/engine.h ../include/openssl/err.h
-s_client.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-s_client.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-s_client.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_client.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h
-s_client.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl3.h
-s_client.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_client.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-s_client.o: ../include/openssl/x509v3.h apps.h progs.h s_apps.h s_client.c
-s_client.o: timeouts.h
+s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h
+s_client.o: ../include/openssl/bio.h ../include/openssl/bn.h
+s_client.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+s_client.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+s_client.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+s_client.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+s_client.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
+s_client.o: ../include/openssl/err.h ../include/openssl/evp.h
+s_client.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
+s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s_client.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_client.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s_client.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_client.o: ../include/openssl/srp.h ../include/openssl/srtp.h
+s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_client.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+s_client.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+s_client.o: progs.h s_apps.h s_client.c timeouts.h
 s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h
 s_server.o: ../include/openssl/bio.h ../include/openssl/bn.h
 s_server.o: ../include/openssl/buffer.h ../include/openssl/comp.h

diff --git a/util/libeay.num b/util/libeay.num
index 4b6893d97f35a44012894067b4b07653ccc8bbd3..68094830d93c48d45387e74917699114ef826d9a 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4656,3 +4656,7 @@ ASYNC_in_job                            5015      EXIST::FUNCTION:
 ASYNC_start_job                         5016   EXIST::FUNCTION:
 ASYNC_init_pool                         5017   EXIST::FUNCTION:
 ASYNC_free_pool                         5018   EXIST::FUNCTION:
+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:

diff --git a/util/ssleay.num b/util/ssleay.num
index be4c940b5f93fcbc03af99b08949637a6c85f5cf..a63fd41ec6312f884213324086dd12560836071c 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -411,3 +411,5 @@ SSL_is_init_finished                    445 EXIST::FUNCTION:
 SSL_get_state                           446    EXIST::FUNCTION:
 SSL_set_default_passwd_cb               447    EXIST::FUNCTION:
 SSL_set_default_passwd_cb_userdata      448    EXIST::FUNCTION:
+SSL_waiting_for_async                   449    EXIST::FUNCTION:
+SSL_get_async_wait_fd                   450    EXIST::FUNCTION: