9 files changed, 164 insertions, 135 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index c985c9945e..2276865936 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -647,7 +647,8 @@ version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 version.o: ../include/openssl/opensslv.h ../include/openssl/rc2.h
 version.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 version.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-version.o: ../include/openssl/sha.h ../include/openssl/stack.h apps.h progs.h
+version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+version.o: ../include/openssl/stack.h apps.h progs.h
 x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index d8bfdf56bc..b7acd565be 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -119,20 +119,20 @@ a_bitstr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bitstr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_bitstr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_bitstr.o: ../cryptlib.h
+a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bitstr.o: ../../include/openssl/stack.h ../cryptlib.h
 a_bmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bmp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_bmp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_bmp.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_bmp.o: ../cryptlib.h
+a_bmp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bmp.o: ../../include/openssl/stack.h ../cryptlib.h
 a_bool.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_bool.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_bool.o: ../cryptlib.h
+a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bool.o: ../../include/openssl/stack.h ../cryptlib.h
 a_bytes.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 a_bytes.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -205,14 +205,14 @@ a_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_enum.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_enum.o: ../cryptlib.h
+a_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_enum.o: ../../include/openssl/stack.h ../cryptlib.h
 a_gentm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_gentm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_gentm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_gentm.o: ../cryptlib.h
+a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_gentm.o: ../../include/openssl/stack.h ../cryptlib.h
 a_hdr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 a_hdr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -251,8 +251,8 @@ a_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_int.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_int.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_int.o: ../cryptlib.h
+a_int.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_int.o: ../../include/openssl/stack.h ../cryptlib.h
 a_meth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_meth.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_meth.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -274,20 +274,20 @@ a_object.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_object.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_object.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 a_object.o: ../../include/openssl/opensslconf.h
-a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_object.o: ../cryptlib.h
+a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_object.o: ../../include/openssl/stack.h ../cryptlib.h
 a_octet.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_octet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_octet.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_octet.o: ../cryptlib.h
+a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_octet.o: ../../include/openssl/stack.h ../cryptlib.h
 a_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_print.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_print.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_print.o: ../cryptlib.h
+a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_print.o: ../../include/openssl/stack.h ../cryptlib.h
 a_set.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 a_set.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 a_set.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -325,8 +325,8 @@ a_time.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_time.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_time.o: ../cryptlib.h
+a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_time.o: ../../include/openssl/stack.h ../cryptlib.h
 a_type.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 a_type.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -348,14 +348,14 @@ a_utctm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_utctm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_utctm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_utctm.o: ../cryptlib.h
+a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_utctm.o: ../../include/openssl/stack.h ../cryptlib.h
 a_utf8.o: ../../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_os.h
 a_utf8.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_utf8.o: ../cryptlib.h
+a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_utf8.o: ../../include/openssl/stack.h ../cryptlib.h
 a_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -377,11 +377,11 @@ a_vis.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_vis.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 a_vis.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_vis.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-a_vis.o: ../cryptlib.h
+a_vis.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_vis.o: ../../include/openssl/stack.h ../cryptlib.h
 asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bn.h
 asn1_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-asn1_err.o: ../../include/openssl/stack.h
+asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 asn1_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 asn1_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 asn1_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -420,8 +420,8 @@ asn_pack.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 asn_pack.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 asn_pack.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-asn_pack.o: ../cryptlib.h
+asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+asn_pack.o: ../../include/openssl/stack.h ../cryptlib.h
 d2i_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 d2i_dhp.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 d2i_dhp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -668,8 +668,9 @@ i2d_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 i2d_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 i2d_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 i2d_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-i2d_pr.o: ../../include/openssl/stack.h ../cryptlib.h
+i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+i2d_pr.o: ../cryptlib.h
 i2d_pu.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 i2d_pu.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 i2d_pu.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -682,8 +683,9 @@ i2d_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 i2d_pu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 i2d_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 i2d_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-i2d_pu.o: ../../include/openssl/stack.h ../cryptlib.h
+i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+i2d_pu.o: ../cryptlib.h
 i2d_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 i2d_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 i2d_r_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index 824b7c9079..7187921c1b 100644
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -113,8 +113,9 @@ bf_buff.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 bf_buff.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_buff.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 bf_buff.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bf_buff.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-bf_buff.o: ../../include/openssl/stack.h ../cryptlib.h
+bf_buff.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bf_buff.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bf_buff.o: ../cryptlib.h
 bf_nbio.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bf_nbio.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -128,8 +129,8 @@ bf_nbio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 bf_nbio.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 bf_nbio.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bf_nbio.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-bf_nbio.o: ../cryptlib.h
+bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+bf_nbio.o: ../../include/openssl/stack.h ../cryptlib.h
 bf_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bf_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -142,8 +143,9 @@ bf_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 bf_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 bf_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-bf_null.o: ../../include/openssl/stack.h ../cryptlib.h
+bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bf_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bf_null.o: ../cryptlib.h
 bio_cb.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 bio_cb.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl
index 7f62a12b5b..d946bcbafa 100644
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@@ -85,14 +85,15 @@ c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
 c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h
 c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-c_rle.o: ../../include/openssl/stack.h
+c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
 c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h
 c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-c_zlib.o: ../../include/openssl/stack.h
+c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
 comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h
 comp_lib.o: ../../include/openssl/opensslconf.h
-comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
+comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+comp_lib.o: ../../include/openssl/stack.h
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index b7cb72afb1..3ad14afaf4 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -116,14 +116,16 @@ dsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 dsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
 dsa_lib.o: ../../include/openssl/e_os.h ../../include/openssl/err.h
 dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_lib.o: ../cryptlib.h
 dsa_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 dsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 dsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
 dsa_sign.o: ../../include/openssl/e_os.h ../../include/openssl/err.h
 dsa_sign.o: ../../include/openssl/opensslconf.h
 dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_sign.o: ../../include/openssl/stack.h ../cryptlib.h
+dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_sign.o: ../cryptlib.h
 dsa_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 dsa_vrf.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 dsa_vrf.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index dec91bdc31..61dd6f4fcb 100644
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -117,8 +117,9 @@ bio_b64.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 bio_b64.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_b64.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 bio_b64.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bio_b64.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-bio_b64.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_b64.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_b64.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_b64.o: ../cryptlib.h
 bio_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bio_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bio_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -131,8 +132,9 @@ bio_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 bio_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 bio_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bio_enc.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-bio_enc.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_enc.o: ../cryptlib.h
 bio_md.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bio_md.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bio_md.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -145,8 +147,9 @@ bio_md.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_md.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 bio_md.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bio_md.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-bio_md.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_md.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_md.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_md.o: ../cryptlib.h
 bio_ok.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bio_ok.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bio_ok.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -160,8 +163,8 @@ bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_ok.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 bio_ok.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 bio_ok.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bio_ok.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-bio_ok.o: ../cryptlib.h
+bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+bio_ok.o: ../../include/openssl/stack.h ../cryptlib.h
 c_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 c_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 c_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -191,8 +194,9 @@ digest.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-digest.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-digest.o: ../../include/openssl/stack.h ../cryptlib.h
+digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+digest.o: ../cryptlib.h
 e_cbc_3d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_3d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_3d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -206,8 +210,8 @@ e_cbc_3d.o: ../../include/openssl/opensslconf.h
 e_cbc_3d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cbc_3d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cbc_3d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cbc_3d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cbc_3d.o: ../cryptlib.h
+e_cbc_3d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cbc_3d.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cbc_bf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_bf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -221,8 +225,8 @@ e_cbc_bf.o: ../../include/openssl/opensslconf.h
 e_cbc_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cbc_bf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cbc_bf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cbc_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cbc_bf.o: ../cryptlib.h
+e_cbc_bf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cbc_bf.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cbc_c.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_c.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_c.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -235,8 +239,9 @@ e_cbc_c.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cbc_c.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cbc_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cbc_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cbc_c.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cbc_c.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cbc_c.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cbc_c.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cbc_c.o: ../cryptlib.h
 e_cbc_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -249,8 +254,9 @@ e_cbc_d.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cbc_d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cbc_d.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cbc_d.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cbc_d.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cbc_d.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cbc_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cbc_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cbc_d.o: ../cryptlib.h
 e_cbc_i.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_i.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_i.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -263,8 +269,9 @@ e_cbc_i.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cbc_i.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cbc_i.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cbc_i.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cbc_i.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cbc_i.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cbc_i.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cbc_i.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cbc_i.o: ../cryptlib.h
 e_cbc_r2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_r2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_r2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -278,8 +285,8 @@ e_cbc_r2.o: ../../include/openssl/opensslconf.h
 e_cbc_r2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cbc_r2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cbc_r2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cbc_r2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cbc_r2.o: ../cryptlib.h
+e_cbc_r2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cbc_r2.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cbc_r5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cbc_r5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cbc_r5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -293,8 +300,8 @@ e_cbc_r5.o: ../../include/openssl/opensslconf.h
 e_cbc_r5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cbc_r5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cbc_r5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cbc_r5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cbc_r5.o: ../cryptlib.h
+e_cbc_r5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cbc_r5.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cfb_3d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_3d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_3d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -308,8 +315,8 @@ e_cfb_3d.o: ../../include/openssl/opensslconf.h
 e_cfb_3d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cfb_3d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cfb_3d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cfb_3d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cfb_3d.o: ../cryptlib.h
+e_cfb_3d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cfb_3d.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cfb_bf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_bf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -323,8 +330,8 @@ e_cfb_bf.o: ../../include/openssl/opensslconf.h
 e_cfb_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cfb_bf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cfb_bf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cfb_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cfb_bf.o: ../cryptlib.h
+e_cfb_bf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cfb_bf.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cfb_c.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_c.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_c.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -337,8 +344,9 @@ e_cfb_c.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cfb_c.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cfb_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cfb_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cfb_c.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cfb_c.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cfb_c.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cfb_c.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cfb_c.o: ../cryptlib.h
 e_cfb_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -351,8 +359,9 @@ e_cfb_d.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cfb_d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cfb_d.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cfb_d.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cfb_d.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cfb_d.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cfb_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cfb_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cfb_d.o: ../cryptlib.h
 e_cfb_i.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_i.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_i.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -365,8 +374,9 @@ e_cfb_i.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_cfb_i.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cfb_i.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_cfb_i.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_cfb_i.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_cfb_i.o: ../../include/openssl/stack.h ../cryptlib.h
+e_cfb_i.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cfb_i.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cfb_i.o: ../cryptlib.h
 e_cfb_r2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_r2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_r2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -380,8 +390,8 @@ e_cfb_r2.o: ../../include/openssl/opensslconf.h
 e_cfb_r2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cfb_r2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cfb_r2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cfb_r2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cfb_r2.o: ../cryptlib.h
+e_cfb_r2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cfb_r2.o: ../../include/openssl/stack.h ../cryptlib.h
 e_cfb_r5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_cfb_r5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_cfb_r5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -395,8 +405,8 @@ e_cfb_r5.o: ../../include/openssl/opensslconf.h
 e_cfb_r5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_cfb_r5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_cfb_r5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cfb_r5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_cfb_r5.o: ../cryptlib.h
+e_cfb_r5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_cfb_r5.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ecb_3d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_3d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_3d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -410,8 +420,8 @@ e_ecb_3d.o: ../../include/openssl/opensslconf.h
 e_ecb_3d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ecb_3d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ecb_3d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ecb_3d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ecb_3d.o: ../cryptlib.h
+e_ecb_3d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ecb_3d.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ecb_bf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_bf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -425,8 +435,8 @@ e_ecb_bf.o: ../../include/openssl/opensslconf.h
 e_ecb_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ecb_bf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ecb_bf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ecb_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ecb_bf.o: ../cryptlib.h
+e_ecb_bf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ecb_bf.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ecb_c.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_c.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_c.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -439,8 +449,9 @@ e_ecb_c.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ecb_c.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ecb_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ecb_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ecb_c.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ecb_c.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ecb_c.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ecb_c.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ecb_c.o: ../cryptlib.h
 e_ecb_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -453,8 +464,9 @@ e_ecb_d.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ecb_d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ecb_d.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ecb_d.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ecb_d.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ecb_d.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ecb_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ecb_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ecb_d.o: ../cryptlib.h
 e_ecb_i.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_i.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_i.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -467,8 +479,9 @@ e_ecb_i.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ecb_i.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ecb_i.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ecb_i.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ecb_i.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ecb_i.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ecb_i.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ecb_i.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ecb_i.o: ../cryptlib.h
 e_ecb_r2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_r2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_r2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -482,8 +495,8 @@ e_ecb_r2.o: ../../include/openssl/opensslconf.h
 e_ecb_r2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ecb_r2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ecb_r2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ecb_r2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ecb_r2.o: ../cryptlib.h
+e_ecb_r2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ecb_r2.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ecb_r5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ecb_r5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ecb_r5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -497,8 +510,8 @@ e_ecb_r5.o: ../../include/openssl/opensslconf.h
 e_ecb_r5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ecb_r5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ecb_r5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ecb_r5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ecb_r5.o: ../cryptlib.h
+e_ecb_r5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ecb_r5.o: ../../include/openssl/stack.h ../cryptlib.h
 e_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -511,8 +524,9 @@ e_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_null.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_null.o: ../../include/openssl/stack.h ../cryptlib.h
+e_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_null.o: ../cryptlib.h
 e_ofb_3d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_3d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_3d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -526,8 +540,8 @@ e_ofb_3d.o: ../../include/openssl/opensslconf.h
 e_ofb_3d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ofb_3d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ofb_3d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ofb_3d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ofb_3d.o: ../cryptlib.h
+e_ofb_3d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ofb_3d.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ofb_bf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_bf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -541,8 +555,8 @@ e_ofb_bf.o: ../../include/openssl/opensslconf.h
 e_ofb_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ofb_bf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ofb_bf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ofb_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ofb_bf.o: ../cryptlib.h
+e_ofb_bf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ofb_bf.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ofb_c.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_c.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_c.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -555,8 +569,9 @@ e_ofb_c.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ofb_c.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ofb_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ofb_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ofb_c.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ofb_c.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ofb_c.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ofb_c.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ofb_c.o: ../cryptlib.h
 e_ofb_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -569,8 +584,9 @@ e_ofb_d.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ofb_d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ofb_d.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ofb_d.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ofb_d.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ofb_d.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ofb_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ofb_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ofb_d.o: ../cryptlib.h
 e_ofb_i.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_i.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_i.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -583,8 +599,9 @@ e_ofb_i.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_ofb_i.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_ofb_i.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_ofb_i.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_ofb_i.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_ofb_i.o: ../../include/openssl/stack.h ../cryptlib.h
+e_ofb_i.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_ofb_i.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_ofb_i.o: ../cryptlib.h
 e_ofb_r2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_r2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_r2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -598,8 +615,8 @@ e_ofb_r2.o: ../../include/openssl/opensslconf.h
 e_ofb_r2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ofb_r2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ofb_r2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ofb_r2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ofb_r2.o: ../cryptlib.h
+e_ofb_r2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ofb_r2.o: ../../include/openssl/stack.h ../cryptlib.h
 e_ofb_r5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_ofb_r5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_ofb_r5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -613,8 +630,8 @@ e_ofb_r5.o: ../../include/openssl/opensslconf.h
 e_ofb_r5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_ofb_r5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_ofb_r5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_ofb_r5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_ofb_r5.o: ../cryptlib.h
+e_ofb_r5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_ofb_r5.o: ../../include/openssl/stack.h ../cryptlib.h
 e_rc4.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_rc4.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_rc4.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -627,8 +644,9 @@ e_rc4.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc4.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 e_rc4.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-e_rc4.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-e_rc4.o: ../../include/openssl/stack.h ../cryptlib.h
+e_rc4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_rc4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_rc4.o: ../cryptlib.h
 e_xcbc_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_xcbc_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_xcbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -642,8 +660,8 @@ e_xcbc_d.o: ../../include/openssl/opensslconf.h
 e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_xcbc_d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
 e_xcbc_d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_xcbc_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-e_xcbc_d.o: ../cryptlib.h
+e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+e_xcbc_d.o: ../../include/openssl/stack.h ../cryptlib.h
 encode.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 encode.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 encode.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -656,8 +674,9 @@ encode.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 encode.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 encode.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 encode.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-encode.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-encode.o: ../../include/openssl/stack.h ../cryptlib.h
+encode.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+encode.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+encode.o: ../cryptlib.h
 evp_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -670,8 +689,9 @@ evp_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 evp_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 evp_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-evp_enc.o: ../../include/openssl/stack.h ../cryptlib.h
+evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_enc.o: ../cryptlib.h
 evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
@@ -683,8 +703,8 @@ evp_err.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 evp_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_err.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-evp_err.o: ../../include/openssl/stack.h
+evp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_key.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_key.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -713,8 +733,9 @@ evp_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 evp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 evp_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-evp_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+evp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_lib.o: ../cryptlib.h
 evp_pbe.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_pbe.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl
index 6452328542..2ad59c383a 100644
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@@ -89,5 +89,5 @@ hmac.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 hmac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 hmac.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 hmac.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-hmac.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
-hmac.o: ../../include/openssl/stack.h
+hmac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+hmac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index 941aaed46e..d15108ee70 100644
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -85,23 +85,23 @@ o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 o_names.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
 o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-o_names.o: ../../include/openssl/stack.h
+o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 obj_dat.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_dat.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 obj_dat.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 obj_dat.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-obj_dat.o: ../cryptlib.h obj_dat.h
+obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+obj_dat.o: ../../include/openssl/stack.h ../cryptlib.h obj_dat.h
 obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-obj_err.o: ../../include/openssl/stack.h
+obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 obj_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 obj_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-obj_lib.o: ../cryptlib.h
+obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+obj_lib.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 04d57385c8..ef12e629c9 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -342,8 +342,8 @@ hmactest.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 hmactest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 hmactest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-hmactest.o: ../include/openssl/rsa.h ../include/openssl/sha.h
-hmactest.o: ../include/openssl/stack.h
+hmactest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+hmactest.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ideatest.o: ../include/openssl/idea.h ../include/openssl/opensslconf.h
 md2test.o: ../include/openssl/md2.h ../include/openssl/opensslconf.h
 md5test.o: ../include/openssl/md5.h