make update

Reviewed-by: Richard Levitte <levitte@openssl.org>

1 files changed, 15 insertions, 38 deletions

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 6e7292e3a7..cfe6b57233 100644
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -73,8 +73,7 @@ clean:
 eng_all.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_all.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_all.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_all.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -88,7 +87,6 @@ eng_cnf.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_cnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
 eng_cnf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_cnf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 eng_cnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 eng_cnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -102,8 +100,7 @@ eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 eng_cryptodev.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-eng_cryptodev.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_cryptodev.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_cryptodev.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_cryptodev.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_cryptodev.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_cryptodev.o: ../../include/openssl/objects.h
@@ -117,8 +114,7 @@ eng_cryptodev.o: ../../include/openssl/x509_vfy.h eng_cryptodev.c
 eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_ctrl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_ctrl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_ctrl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_ctrl.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_ctrl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_ctrl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -132,7 +128,6 @@ eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_dyn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_dyn.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
 eng_dyn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_dyn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 eng_dyn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 eng_dyn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -145,7 +140,6 @@ eng_dyn.o: ../include/internal/cryptlib.h eng_dyn.c eng_int.h
 eng_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 eng_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 eng_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 eng_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 eng_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -159,7 +153,6 @@ eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_fat.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
 eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_fat.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 eng_fat.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 eng_fat.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -172,8 +165,7 @@ eng_fat.o: ../include/internal/cryptlib.h eng_fat.c eng_int.h
 eng_init.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_init.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_init.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_init.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_init.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -186,8 +178,7 @@ eng_init.o: eng_init.c eng_int.h
 eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_lib.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -200,8 +191,7 @@ eng_lib.o: ../include/internal/cryptlib.h eng_int.h eng_lib.c
 eng_list.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_list.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_list.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_list.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_list.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_list.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_list.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_list.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_list.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -216,8 +206,7 @@ eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_openssl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
 eng_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
 eng_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
-eng_openssl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_openssl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_openssl.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_openssl.o: ../../include/openssl/hmac.h ../../include/openssl/lhash.h
 eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -234,8 +223,7 @@ eng_openssl.o: ../include/internal/cryptlib.h eng_openssl.c
 eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_pkey.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -248,7 +236,6 @@ eng_pkey.o: eng_int.h eng_pkey.c
 eng_rdrand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 eng_rdrand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 eng_rdrand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_rdrand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 eng_rdrand.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 eng_rdrand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -262,8 +249,7 @@ eng_rdrand.o: eng_rdrand.c
 eng_table.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-eng_table.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-eng_table.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_table.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 eng_table.o: ../../include/openssl/objects.h
@@ -277,8 +263,7 @@ eng_table.o: eng_int.h eng_table.c
 tb_asnmth.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_asnmth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_asnmth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_asnmth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_asnmth.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_asnmth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_asnmth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_asnmth.o: ../../include/openssl/objects.h
@@ -292,8 +277,7 @@ tb_asnmth.o: ../include/internal/cryptlib.h eng_int.h tb_asnmth.c
 tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_cipher.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_cipher.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_cipher.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_cipher.o: ../../include/openssl/objects.h
@@ -307,7 +291,6 @@ tb_cipher.o: eng_int.h tb_cipher.c
 tb_dh.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 tb_dh.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-tb_dh.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 tb_dh.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -320,8 +303,7 @@ tb_dh.o: ../include/internal/cryptlib.h eng_int.h tb_dh.c
 tb_digest.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_digest.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_digest.o: ../../include/openssl/objects.h
@@ -335,7 +317,6 @@ tb_digest.o: eng_int.h tb_digest.c
 tb_dsa.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 tb_dsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-tb_dsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 tb_dsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -361,8 +342,7 @@ tb_eckey.o: eng_int.h tb_eckey.c
 tb_pkmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_pkmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_pkmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_pkmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_pkmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_pkmeth.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_pkmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_pkmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_pkmeth.o: ../../include/openssl/objects.h
@@ -376,8 +356,7 @@ tb_pkmeth.o: eng_int.h tb_pkmeth.c
 tb_rand.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_rand.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_rand.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_rand.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -390,7 +369,6 @@ tb_rand.o: eng_int.h tb_rand.c
 tb_rsa.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 tb_rsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-tb_rsa.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
 tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
 tb_rsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
@@ -403,8 +381,7 @@ tb_rsa.o: ../include/internal/cryptlib.h eng_int.h tb_rsa.c
 tb_store.o: ../../e_os.h ../../include/openssl/asn1.h
 tb_store.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 tb_store.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tb_store.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-tb_store.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_store.o: ../../include/openssl/ec.h ../../include/openssl/engine.h
 tb_store.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 tb_store.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
 tb_store.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h