Apply some missing updates from previous commits

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/test/Makefile b/test/Makefile
index 08360a2186bee4feaca32851ce56c0b66830fc3c..d9aa750d07e71299f258bcf29565aca1e5fac3e8 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -889,12 +889,21 @@ v3nametest.o: ../include/openssl/sha.h ../include/openssl/stack.h
 v3nametest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
 v3nametest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
 v3nametest.o: v3nametest.c
-verify_extra_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+verify_extra_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+verify_extra_test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
+verify_extra_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+verify_extra_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+verify_extra_test.o: ../include/openssl/err.h ../include/openssl/evp.h
+verify_extra_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+verify_extra_test.o: ../include/openssl/objects.h
 verify_extra_test.o: ../include/openssl/opensslconf.h
 verify_extra_test.o: ../include/openssl/opensslv.h
-verify_extra_test.o: ../include/openssl/ossl_typ.h
-verify_extra_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-verify_extra_test.o: ../include/openssl/symhacks.h verify_extra_test.c
+verify_extra_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+verify_extra_test.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+verify_extra_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+verify_extra_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+verify_extra_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+verify_extra_test.o: verify_extra_test.c
 wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h

diff --git a/util/libeay.num b/util/libeay.num
index 99334999808a057137c0c1071d7d7ed5a0abefda..4d3642f0715d532ab54bf464db606ccc85851fbc 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4587,3 +4587,4 @@ CRYPTO_secure_free                      4945      EXIST::FUNCTION:
 BIO_s_secmem                            4946   EXIST::FUNCTION:
 CRYPTO_get_secure_mem_ex_functions      4947   EXIST::FUNCTION:
 CRYPTO_set_secure_mem_functions         4948   EXIST::FUNCTION:
+X509_STORE_CTX_get_num_untrusted        4949   EXIST::FUNCTION: