aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/Makefile.ssl9
-rw-r--r--crypto/Makefile.ssl2
-rw-r--r--crypto/asn1/Makefile.ssl6
-rw-r--r--crypto/dh/Makefile.ssl32
-rw-r--r--crypto/dsa/Makefile.ssl67
-rw-r--r--crypto/engine/Makefile.ssl188
-rw-r--r--crypto/err/Makefile.ssl20
-rw-r--r--crypto/rand/Makefile.ssl17
-rw-r--r--crypto/rsa/Makefile.ssl37
-rw-r--r--test/Makefile.ssl25
-rwxr-xr-xutil/libeay.num8
11 files changed, 236 insertions, 175 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index e54b0a9409..0fe178959c 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -160,6 +160,7 @@ app_rand.o: ../include/openssl/md2.h ../include/openssl/md4.h
app_rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
app_rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+app_rand.o: ../include/openssl/pem.h ../include/openssl/pem2.h
app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
app_rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
app_rand.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
@@ -607,7 +608,8 @@ passwd.o: ../include/openssl/lhash.h ../include/openssl/md2.h
passwd.o: ../include/openssl/md4.h ../include/openssl/md5.h
passwd.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
passwd.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-passwd.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+passwd.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+passwd.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
passwd.o: ../include/openssl/rand.h ../include/openssl/rc2.h
passwd.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
passwd.o: ../include/openssl/rd_fst.h ../include/openssl/rijndael.h
@@ -693,7 +695,8 @@ rand.o: ../include/openssl/lhash.h ../include/openssl/md2.h
rand.o: ../include/openssl/md4.h ../include/openssl/md5.h
rand.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+rand.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+rand.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h
rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
rand.o: ../include/openssl/rd_fst.h ../include/openssl/rijndael.h
@@ -949,6 +952,7 @@ speed.o: ../include/openssl/md2.h ../include/openssl/md4.h
speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+speed.o: ../include/openssl/pem.h ../include/openssl/pem2.h
speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
speed.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
@@ -1012,6 +1016,7 @@ version.o: ../include/openssl/md2.h ../include/openssl/md4.h
version.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
version.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+version.o: ../include/openssl/pem.h ../include/openssl/pem2.h
version.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
version.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
version.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index fc61d38572..8e682e0afb 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -192,6 +192,8 @@ mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h
mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
mem_dbg.o: ../include/openssl/safestack.h ../include/openssl/stack.h
mem_dbg.o: ../include/openssl/symhacks.h cryptlib.h mem_dbg.c
+o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
+o_time.o: o_time.h
tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
tmdiff.o: ../include/openssl/err.h ../include/openssl/lhash.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 882bd36f1a..036050859e 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -184,7 +184,7 @@ a_gentm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
a_gentm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
a_gentm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_gentm.o: ../cryptlib.h a_gentm.c
+a_gentm.o: ../cryptlib.h ../o_time.h a_gentm.c
a_hdr.o: ../../e_os.h ../../include/openssl/asn1.h
a_hdr.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -310,7 +310,7 @@ a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
a_time.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_time.o: ../../include/openssl/symhacks.h ../cryptlib.h a_time.c
+a_time.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_time.c
a_type.o: ../../e_os.h ../../include/openssl/asn1.h
a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -326,7 +326,7 @@ a_utctm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
a_utctm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
a_utctm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_utctm.o: ../cryptlib.h a_utctm.c
+a_utctm.o: ../cryptlib.h ../o_time.h a_utctm.c
a_utf8.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index a519ef2c37..b99dd36569 100644
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -123,13 +123,15 @@ dh_key.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
dh_key.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
dh_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_key.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-dh_key.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-dh_key.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-dh_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dh_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_key.o: ../cryptlib.h dh_key.c
+dh_key.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+dh_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+dh_key.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+dh_key.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+dh_key.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+dh_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dh_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dh_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+dh_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_key.c
dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
dh_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -142,10 +144,12 @@ dh_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
dh_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
dh_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-dh_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-dh_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-dh_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dh_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_lib.o: ../cryptlib.h dh_lib.c
+dh_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+dh_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+dh_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+dh_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+dh_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+dh_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dh_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+dh_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_lib.c
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index 255d58f342..b5fe91e264 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -128,13 +128,16 @@ dsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
dsa_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
dsa_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
dsa_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-dsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-dsa_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-dsa_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-dsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_lib.c
+dsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+dsa_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+dsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+dsa_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+dsa_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+dsa_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dsa_lib.o: ../cryptlib.h dsa_lib.c
dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -147,13 +150,16 @@ dsa_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
dsa_ossl.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
dsa_ossl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
dsa_ossl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_ossl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-dsa_ossl.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-dsa_ossl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-dsa_ossl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_ossl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_ossl.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_ossl.c
+dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+dsa_ossl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+dsa_ossl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+dsa_ossl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+dsa_ossl.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+dsa_ossl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+dsa_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_ossl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dsa_ossl.o: ../cryptlib.h dsa_ossl.c
dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
dsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
dsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -166,13 +172,16 @@ dsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
dsa_sign.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
dsa_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
dsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-dsa_sign.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-dsa_sign.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-dsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_sign.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_sign.c
+dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+dsa_sign.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+dsa_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+dsa_sign.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+dsa_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dsa_sign.o: ../cryptlib.h dsa_sign.c
dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
dsa_vrf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
@@ -186,10 +195,12 @@ dsa_vrf.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
dsa_vrf.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
dsa_vrf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
dsa_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_vrf.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-dsa_vrf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-dsa_vrf.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-dsa_vrf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-dsa_vrf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dsa_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_vrf.o: ../cryptlib.h dsa_vrf.c
+dsa_vrf.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+dsa_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+dsa_vrf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+dsa_vrf.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+dsa_vrf.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dsa_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dsa_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+dsa_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_vrf.c
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 507821e374..63f2f28966 100644
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -83,42 +83,48 @@ clean:
engine_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
engine_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-engine_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-engine_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-engine_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-engine_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-engine_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-engine_all.o: ../../include/openssl/objects.h
+engine_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+engine_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+engine_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+engine_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+engine_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+engine_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+engine_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+engine_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
engine_all.o: ../../include/openssl/opensslconf.h
-engine_all.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-engine_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-engine_all.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-engine_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-engine_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-engine_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-engine_all.o: ../../include/openssl/symhacks.h engine_all.c engine_int.h
+engine_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+engine_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+engine_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+engine_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+engine_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+engine_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+engine_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+engine_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+engine_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+engine_all.o: engine_all.c engine_int.h
engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-engine_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-engine_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-engine_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-engine_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-engine_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-engine_err.o: ../../include/openssl/objects.h
+engine_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+engine_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+engine_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+engine_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+engine_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+engine_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+engine_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+engine_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
engine_err.o: ../../include/openssl/opensslconf.h
-engine_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-engine_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-engine_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-engine_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-engine_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-engine_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-engine_err.o: ../../include/openssl/symhacks.h engine_err.c
+engine_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+engine_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+engine_err.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+engine_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+engine_err.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+engine_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+engine_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+engine_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+engine_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+engine_err.o: engine_err.c
engine_lib.o: ../../e_os.h ../../include/openssl/asn1.h
engine_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
engine_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -132,14 +138,16 @@ engine_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
engine_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
engine_lib.o: ../../include/openssl/objects.h
engine_lib.o: ../../include/openssl/opensslconf.h
-engine_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-engine_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-engine_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-engine_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-engine_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-engine_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-engine_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
-engine_lib.o: engine_lib.c
+engine_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+engine_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+engine_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+engine_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+engine_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+engine_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+engine_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+engine_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+engine_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+engine_lib.o: ../cryptlib.h engine_int.h engine_lib.c
engine_list.o: ../../e_os.h ../../include/openssl/asn1.h
engine_list.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
engine_list.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -153,14 +161,16 @@ engine_list.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
engine_list.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
engine_list.o: ../../include/openssl/objects.h
engine_list.o: ../../include/openssl/opensslconf.h
-engine_list.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-engine_list.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-engine_list.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-engine_list.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-engine_list.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-engine_list.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-engine_list.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
-engine_list.o: engine_list.c
+engine_list.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+engine_list.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+engine_list.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+engine_list.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+engine_list.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+engine_list.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+engine_list.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+engine_list.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+engine_list.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+engine_list.o: ../cryptlib.h engine_int.h engine_list.c
engine_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
engine_openssl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
engine_openssl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -175,14 +185,17 @@ engine_openssl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
engine_openssl.o: ../../include/openssl/obj_mac.h
engine_openssl.o: ../../include/openssl/objects.h
engine_openssl.o: ../../include/openssl/opensslconf.h
-engine_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-engine_openssl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-engine_openssl.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+engine_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+engine_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+engine_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+engine_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+engine_openssl.o: ../../include/openssl/rd_fst.h
engine_openssl.o: ../../include/openssl/rijndael.h
engine_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
engine_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
engine_openssl.o: ../../include/openssl/stack.h
-engine_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h
+engine_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+engine_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
engine_openssl.o: engine_openssl.c
hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
@@ -197,14 +210,16 @@ hw_atalla.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
hw_atalla.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
hw_atalla.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
hw_atalla.o: ../../include/openssl/opensslconf.h
-hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_atalla.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-hw_atalla.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-hw_atalla.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-hw_atalla.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_atalla.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-hw_atalla.o: ../../include/openssl/symhacks.h ../cryptlib.h hw_atalla.c
-hw_atalla.o: vendor_defns/atalla.h
+hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+hw_atalla.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+hw_atalla.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_atalla.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_atalla.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+hw_atalla.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+hw_atalla.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+hw_atalla.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hw_atalla.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_atalla.o: ../cryptlib.h hw_atalla.c vendor_defns/atalla.h
hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
hw_cswift.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -218,14 +233,16 @@ hw_cswift.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
hw_cswift.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
hw_cswift.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
hw_cswift.o: ../../include/openssl/opensslconf.h
-hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_cswift.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-hw_cswift.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-hw_cswift.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_cswift.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-hw_cswift.o: ../../include/openssl/symhacks.h ../cryptlib.h hw_cswift.c
-hw_cswift.o: vendor_defns/cswift.h
+hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+hw_cswift.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+hw_cswift.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_cswift.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_cswift.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+hw_cswift.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+hw_cswift.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hw_cswift.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_cswift.o: ../cryptlib.h hw_cswift.c vendor_defns/cswift.h
hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h
hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
hw_ncipher.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -262,13 +279,16 @@ hw_nuron.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
hw_nuron.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
hw_nuron.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
hw_nuron.o: ../../include/openssl/opensslconf.h
-hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_nuron.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-hw_nuron.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-hw_nuron.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-hw_nuron.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_nuron.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-hw_nuron.o: ../../include/openssl/symhacks.h ../cryptlib.h hw_nuron.c
+hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+hw_nuron.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_nuron.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_nuron.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+hw_nuron.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+hw_nuron.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hw_nuron.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_nuron.o: ../cryptlib.h hw_nuron.c
hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
hw_ubsec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -282,11 +302,13 @@ hw_ubsec.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
hw_ubsec.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
hw_ubsec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
hw_ubsec.o: ../../include/openssl/opensslconf.h
-hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_ubsec.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-hw_ubsec.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-hw_ubsec.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-hw_ubsec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_ubsec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-hw_ubsec.o: ../../include/openssl/symhacks.h ../cryptlib.h hw_ubsec.c
-hw_ubsec.o: vendor_defns/hw_ubsec.h
+hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+hw_ubsec.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+hw_ubsec.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_ubsec.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_ubsec.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+hw_ubsec.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+hw_ubsec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hw_ubsec.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_ubsec.o: ../cryptlib.h hw_ubsec.c vendor_defns/hw_ubsec.h
diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl
index adfd1fd0b4..e13bbb178f 100644
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -99,16 +99,16 @@ err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
err_all.o: ../../include/openssl/mdc2.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/pem2.h ../../include/openssl/pkcs12.h
-err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-err_all.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-err_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.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/x509.h
-err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-err_all.o: err_all.c
+err_all.o: ../../include/openssl/pem.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/rc2.h
+err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+err_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+err_all.o: ../../include/openssl/ripemd.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/x509.h ../../include/openssl/x509_vfy.h
+err_all.o: ../../include/openssl/x509v3.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/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index edc053539a..03fff3864c 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -108,13 +108,16 @@ rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
rand_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
rand_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-rand_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-rand_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-rand_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rand_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rand_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lib.c
+rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+rand_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+rand_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+rand_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+rand_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+rand_lib.o: ../cryptlib.h rand_lib.c
rand_unix.o: ../../e_os.h ../../include/openssl/bio.h
rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
rand_unix.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index b3e5dc9654..04d4a51d96 100644
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -111,13 +111,16 @@ rsa_eay.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
rsa_eay.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
rsa_eay.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
rsa_eay.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_eay.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-rsa_eay.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-rsa_eay.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_eay.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c
+rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+rsa_eay.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+rsa_eay.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+rsa_eay.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+rsa_eay.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+rsa_eay.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_eay.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+rsa_eay.o: ../cryptlib.h rsa_eay.c
rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
rsa_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -145,13 +148,16 @@ rsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
rsa_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
rsa_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
rsa_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-rsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-rsa_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-rsa_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rsa_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_lib.c
+rsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+rsa_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+rsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+rsa_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+rsa_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+rsa_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+rsa_lib.o: ../cryptlib.h rsa_lib.c
rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h
rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -220,7 +226,8 @@ rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
rsa_sign.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
rsa_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
+rsa_sign.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
rsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
rsa_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
rsa_sign.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 6ca5f5f983..f046983911 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -395,22 +395,25 @@ ectest.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
ectest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ectest.c
enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
enginetest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-enginetest.o: ../include/openssl/cast.h ../include/openssl/crypto.h
-enginetest.o: ../include/openssl/des.h ../include/openssl/dh.h
-enginetest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h
-enginetest.o: ../include/openssl/evp.h ../include/openssl/idea.h
-enginetest.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-enginetest.o: ../include/openssl/md4.h ../include/openssl/md5.h
-enginetest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-enginetest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-enginetest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
+enginetest.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+enginetest.o: ../include/openssl/crypto.h ../include/openssl/des.h
+enginetest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+enginetest.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+enginetest.o: ../include/openssl/err.h ../include/openssl/evp.h
+enginetest.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+enginetest.o: ../include/openssl/md2.h ../include/openssl/md4.h
+enginetest.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+enginetest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+enginetest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+enginetest.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+enginetest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
enginetest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
enginetest.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
enginetest.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
enginetest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
enginetest.o: ../include/openssl/sha.h ../include/openssl/stack.h
-enginetest.o: ../include/openssl/symhacks.h enginetest.c
+enginetest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
+enginetest.o: ../include/openssl/x509_vfy.h enginetest.c
exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
diff --git a/util/libeay.num b/util/libeay.num
index e3d2093baa..b2af11258a 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2465,7 +2465,8 @@ OCSP_crlID_new 2928 EXIST:!VMS,!WIN16:FUNCTION:
OCSP_crlID2_new 2928 EXIST:VMS,WIN16:FUNCTION:
ENGINE_ctrl_cmd_string 2929 EXIST::FUNCTION:
ENGINE_get_cmd_defns 2930 EXIST::FUNCTION:
-ENGINE_set_load_privkey_function 2931 EXIST::FUNCTION:
+ENGINE_set_load_privkey_function 2931 EXIST:!VMS:FUNCTION:
+ENGINE_set_load_privkey_fn 2931 EXIST:VMS:FUNCTION:
ENGINE_cmd_is_executable 2932 EXIST::FUNCTION:
ENGINE_set_load_pubkey_function 2933 EXIST::FUNCTION:
ENGINE_get_load_pubkey_function 2934 EXIST::FUNCTION:
@@ -2473,7 +2474,8 @@ ENGINE_set_cmd_defns 2935 EXIST::FUNCTION:
ENGINE_get_flags 2936 EXIST::FUNCTION:
ENGINE_cpy 2937 EXIST::FUNCTION:
ENGINE_set_flags 2938 EXIST::FUNCTION:
-ENGINE_get_load_privkey_function 2939 EXIST::FUNCTION:
+ENGINE_get_load_privkey_function 2939 EXIST:!VMS:FUNCTION:
+ENGINE_get_load_privkey_fn 2939 EXIST:VMS:FUNCTION:
ENGINE_cleanup 2940 EXIST::FUNCTION:
ENGINE_get_ex_new_index 2941 EXIST::FUNCTION:
ENGINE_get_ex_data 2942 EXIST::FUNCTION:
@@ -2521,3 +2523,5 @@ X509_PURPOSE_set 2983 EXIST::FUNCTION:
X509_TRUST_set 2984 EXIST::FUNCTION:
X509_STORE_set_purpose 2985 EXIST::FUNCTION:
X509_STORE_set_trust 2986 EXIST::FUNCTION:
+UI_get0_user_data 2987 EXIST::FUNCTION:
+UI_add_user_data 2988 EXIST::FUNCTION: