Add type-safe STACKs and SETs.

5 files changed, 261 insertions, 194 deletions

diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 5bf33158e0..4dbf8ca8be 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -136,9 +136,9 @@ a_bytes.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_bytes.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_bytes.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_bytes.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_bytes.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_bytes.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_bytes.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_bytes.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_bytes.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_bytes.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_d2i_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_d2i_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_d2i_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -146,9 +146,9 @@ a_d2i_fp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_d2i_fp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_d2i_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_d2i_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_d2i_fp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_d2i_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_d2i_fp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_d2i_fp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_d2i_fp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_d2i_fp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_digest.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_digest.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_digest.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -156,9 +156,9 @@ a_digest.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_digest.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_digest.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_digest.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_digest.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_digest.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_digest.o: ../crypto.h ../opensslv.h asn1.h
+a_digest.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_digest.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_digest.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_dup.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_dup.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_dup.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -166,9 +166,9 @@ a_dup.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_dup.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_dup.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_dup.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_dup.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_dup.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_dup.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_dup.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_dup.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_dup.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_enum.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_enum.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
 a_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
@@ -182,9 +182,9 @@ a_hdr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_hdr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_hdr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_hdr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_hdr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_hdr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_hdr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_hdr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_hdr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_hdr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_i2d_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_i2d_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_i2d_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -192,9 +192,9 @@ a_i2d_fp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_i2d_fp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_i2d_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_i2d_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_i2d_fp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_i2d_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_i2d_fp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_i2d_fp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_i2d_fp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_i2d_fp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_int.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_int.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
 a_int.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
@@ -205,9 +205,9 @@ a_meth.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_meth.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_meth.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_meth.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_meth.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_meth.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_meth.o: ../crypto.h ../opensslv.h asn1.h
+a_meth.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_meth.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_meth.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_object.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_object.o: ../../include/e_os.h ../../include/err.h ../../include/objects.h
 a_object.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
@@ -225,9 +225,9 @@ a_set.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_set.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_set.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_set.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_set.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_set.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_set.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_set.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_set.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_set.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_sign.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_sign.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_sign.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -235,9 +235,9 @@ a_sign.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_sign.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_sign.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_sign.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_sign.o: ../crypto.h ../opensslv.h asn1.h
+a_sign.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_sign.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_time.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_time.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
 a_time.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
@@ -248,9 +248,9 @@ a_type.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_type.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_type.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_type.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_type.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_type.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_type.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_type.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_type.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_type.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_utctm.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_utctm.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
 a_utctm.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
@@ -261,9 +261,9 @@ a_verify.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 a_verify.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 a_verify.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_verify.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-a_verify.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-a_verify.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_verify.o: ../crypto.h ../opensslv.h asn1.h
+a_verify.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+a_verify.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_verify.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h asn1.h
 asn1_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
@@ -272,9 +272,9 @@ asn1_lib.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 asn1_lib.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 asn1_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-asn1_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-asn1_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-asn1_lib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+asn1_lib.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+asn1_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+asn1_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 asn1_par.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_par.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 asn1_par.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -282,9 +282,9 @@ asn1_par.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 asn1_par.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 asn1_par.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_par.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-asn1_par.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-asn1_par.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-asn1_par.o: ../crypto.h ../opensslv.h asn1.h
+asn1_par.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+asn1_par.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+asn1_par.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 asn_pack.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 asn_pack.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
 asn_pack.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
@@ -295,9 +295,9 @@ d2i_dhp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_dhp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_dhp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_dhp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_dhp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_dhp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_dhp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_dhp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -305,9 +305,9 @@ d2i_dsap.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_dsap.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_dsap.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_dsap.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_dsap.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_dsap.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_dsap.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_dsap.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -315,9 +315,9 @@ d2i_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_pr.o: ../crypto.h ../opensslv.h asn1.h
+d2i_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 d2i_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -325,9 +325,9 @@ d2i_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_pu.o: ../crypto.h ../opensslv.h asn1.h
+d2i_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 d2i_r_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -335,9 +335,9 @@ d2i_r_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_r_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_r_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_r_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_r_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_r_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_r_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_r_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_r_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_r_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -345,9 +345,9 @@ d2i_r_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_r_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_r_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_r_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_r_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_r_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_r_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_r_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_r_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_s_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -355,9 +355,9 @@ d2i_s_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_s_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_s_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_s_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_s_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_s_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_s_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_s_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_s_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_s_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -365,9 +365,9 @@ d2i_s_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 d2i_s_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 d2i_s_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-d2i_s_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-d2i_s_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_s_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_s_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+d2i_s_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+d2i_s_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 evp_asn1.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 evp_asn1.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 evp_asn1.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -375,9 +375,9 @@ evp_asn1.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 evp_asn1.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 evp_asn1.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 evp_asn1.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-evp_asn1.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-evp_asn1.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-evp_asn1.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+evp_asn1.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+evp_asn1.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+evp_asn1.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 f_enum.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_enum.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_enum.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -385,9 +385,9 @@ f_enum.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 f_enum.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 f_enum.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_enum.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-f_enum.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-f_enum.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_enum.o: ../crypto.h ../opensslv.h asn1.h
+f_enum.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+f_enum.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+f_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 f_int.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_int.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_int.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -395,9 +395,9 @@ f_int.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 f_int.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 f_int.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_int.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-f_int.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-f_int.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_int.o: ../crypto.h ../opensslv.h asn1.h
+f_int.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+f_int.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+f_int.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 f_string.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_string.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_string.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -405,9 +405,9 @@ f_string.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 f_string.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 f_string.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_string.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-f_string.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-f_string.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_string.o: ../crypto.h ../opensslv.h asn1.h
+f_string.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+f_string.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+f_string.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 i2d_dhp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dhp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dhp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -415,9 +415,9 @@ i2d_dhp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_dhp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_dhp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_dhp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_dhp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_dhp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_dhp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_dhp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -425,9 +425,9 @@ i2d_dsap.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_dsap.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_dsap.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_dsap.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_dsap.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_dsap.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_dsap.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_dsap.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -453,9 +453,9 @@ i2d_r_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_r_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_r_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_r_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_r_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_r_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_r_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_r_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_r_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_r_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_r_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_r_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_r_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -463,9 +463,9 @@ i2d_r_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_r_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_r_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_r_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_r_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_r_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_r_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_r_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_r_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_r_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_s_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_s_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_s_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -473,9 +473,9 @@ i2d_s_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_s_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_s_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_s_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_s_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_s_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_s_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_s_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_s_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_s_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_s_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_s_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_s_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -483,9 +483,9 @@ i2d_s_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 i2d_s_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_s_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_s_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_s_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_s_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_s_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_s_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+i2d_s_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+i2d_s_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 n_pkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 n_pkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 n_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -493,18 +493,18 @@ n_pkey.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 n_pkey.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 n_pkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 n_pkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-n_pkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-n_pkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-n_pkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+n_pkey.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+n_pkey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+n_pkey.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 nsseq.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 nsseq.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
 nsseq.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h
 nsseq.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 nsseq.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 nsseq.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-nsseq.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-nsseq.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-nsseq.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+nsseq.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
+nsseq.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
+nsseq.o: ../../include/x509_vfy.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p5_pbe.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p5_pbe.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p5_pbe.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -512,9 +512,21 @@ p5_pbe.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p5_pbe.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p5_pbe.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rand.h
 p5_pbe.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-p5_pbe.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-p5_pbe.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p5_pbe.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p5_pbe.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
+p5_pbe.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
+p5_pbe.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
+p5_pbe.o: asn1.h asn1_mac.h
+p5_pbev2.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
+p5_pbev2.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
+p5_pbev2.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
+p5_pbev2.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+p5_pbev2.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+p5_pbev2.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rand.h
+p5_pbev2.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+p5_pbev2.o: ../../include/ripemd.h ../../include/rsa.h
+p5_pbev2.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+p5_pbev2.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+p5_pbev2.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_dgst.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_dgst.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_dgst.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -522,9 +534,9 @@ p7_dgst.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_dgst.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_dgst.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_dgst.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_dgst.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_dgst.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_dgst.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_dgst.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_dgst.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_dgst.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_enc.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_enc.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_enc.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -532,9 +544,9 @@ p7_enc.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_enc.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_enc.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_enc.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_enc.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_enc.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_enc.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_enc.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_enc.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_enc.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_enc_c.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_enc_c.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_enc_c.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -542,9 +554,9 @@ p7_enc_c.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_enc_c.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_enc_c.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_enc_c.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_enc_c.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_enc_c.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_enc_c.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_enc_c.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_enc_c.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_enc_c.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_evp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_evp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_evp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -552,9 +564,9 @@ p7_evp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_evp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_evp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_evp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_evp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_evp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_evp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_evp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_evp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_evp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_i_s.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_i_s.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_i_s.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -562,9 +574,9 @@ p7_i_s.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_i_s.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_i_s.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_i_s.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_i_s.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_i_s.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_i_s.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_i_s.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_i_s.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_i_s.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_lib.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -572,9 +584,9 @@ p7_lib.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_lib.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_lib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_lib.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_recip.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_recip.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_recip.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -582,9 +594,9 @@ p7_recip.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_recip.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_recip.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_recip.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_recip.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_recip.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_recip.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_recip.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_recip.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_recip.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_s_e.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_s_e.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_s_e.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -592,9 +604,9 @@ p7_s_e.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_s_e.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_s_e.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_s_e.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_s_e.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_s_e.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_s_e.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_s_e.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_s_e.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_s_e.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_signd.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_signd.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_signd.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -602,9 +614,9 @@ p7_signd.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_signd.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_signd.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_signd.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_signd.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_signd.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_signd.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_signd.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_signd.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_signd.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_signi.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_signi.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_signi.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -612,9 +624,9 @@ p7_signi.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p7_signi.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p7_signi.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_signi.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p7_signi.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p7_signi.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_signi.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p7_signi.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p7_signi.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p7_signi.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p8_pkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p8_pkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p8_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -622,9 +634,9 @@ p8_pkey.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 p8_pkey.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 p8_pkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p8_pkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-p8_pkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-p8_pkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p8_pkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+p8_pkey.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+p8_pkey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+p8_pkey.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 t_crl.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 t_crl.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 t_crl.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -632,9 +644,9 @@ t_crl.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 t_crl.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 t_crl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_crl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-t_crl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-t_crl.o: ../../include/x509.h ../../include/x509_vfy.h ../../include/x509v3.h
-t_crl.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+t_crl.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+t_crl.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+t_crl.o: ../../include/x509v3.h ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 t_pkey.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 t_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
 t_pkey.o: ../../include/err.h ../../include/rsa.h ../../include/stack.h
@@ -646,9 +658,9 @@ t_req.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 t_req.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 t_req.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-t_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-t_req.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-t_req.o: ../crypto.h ../opensslv.h asn1.h
+t_req.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+t_req.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+t_req.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 t_x509.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 t_x509.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 t_x509.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -656,9 +668,9 @@ t_x509.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 t_x509.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 t_x509.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_x509.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-t_x509.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-t_x509.o: ../../include/x509.h ../../include/x509_vfy.h ../../include/x509v3.h
-t_x509.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+t_x509.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+t_x509.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+t_x509.o: ../../include/x509v3.h ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 x_algor.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_algor.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_algor.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -666,9 +678,9 @@ x_algor.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_algor.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_algor.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_algor.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_algor.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_algor.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_algor.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_algor.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_algor.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_algor.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_attrib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_attrib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_attrib.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -676,9 +688,9 @@ x_attrib.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_attrib.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_attrib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_attrib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_attrib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_attrib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_attrib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_attrib.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_attrib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_attrib.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_cinf.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_cinf.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_cinf.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -686,9 +698,9 @@ x_cinf.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_cinf.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_cinf.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_cinf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_cinf.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_cinf.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_cinf.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_cinf.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_cinf.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_cinf.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_crl.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_crl.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_crl.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -696,9 +708,9 @@ x_crl.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_crl.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_crl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_crl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_crl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_crl.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_crl.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_crl.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_crl.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_crl.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_exten.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_exten.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_exten.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -706,9 +718,9 @@ x_exten.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_exten.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_exten.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_exten.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_exten.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_exten.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_exten.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_exten.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_exten.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_exten.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_info.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_info.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_info.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -716,9 +728,9 @@ x_info.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_info.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_info.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_info.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_info.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_info.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_info.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_info.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_info.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_info.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_name.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_name.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_name.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -726,9 +738,9 @@ x_name.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_name.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_name.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_name.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_name.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_name.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_name.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_name.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_name.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_name.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_pkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_pkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -736,9 +748,9 @@ x_pkey.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_pkey.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_pkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_pkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_pkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_pkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_pkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_pkey.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_pkey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_pkey.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_pubkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_pubkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_pubkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -746,9 +758,9 @@ x_pubkey.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_pubkey.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_pubkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_pubkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_pubkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_pubkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_pubkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_pubkey.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_pubkey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_pubkey.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_req.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_req.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_req.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -756,9 +768,9 @@ x_req.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_req.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_req.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_req.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_req.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_req.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_req.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_req.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_sig.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_sig.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_sig.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -766,9 +778,9 @@ x_sig.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_sig.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_sig.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_sig.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_sig.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_sig.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_sig.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_sig.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_sig.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_sig.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_spki.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_spki.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_spki.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -776,9 +788,9 @@ x_spki.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_spki.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_spki.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_spki.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_spki.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_spki.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_spki.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_spki.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_spki.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_spki.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_val.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_val.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_val.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -786,9 +798,9 @@ x_val.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_val.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_val.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_val.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_val.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_val.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_val.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_val.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_val.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_val.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_x509.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_x509.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_x509.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -796,6 +808,6 @@ x_x509.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 x_x509.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 x_x509.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_x509.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-x_x509.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x_x509.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_x509.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+x_x509.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
+x_x509.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+x_x509.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index e2280c2c11..c0002e95e7 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -485,6 +485,33 @@ STACK *		d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
 			char *(*func)(), void (*free_func)(),
 			int ex_tag, int ex_class);
 
+#define DECLARE_ASN1_SET_OF(type) \
+int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
+			   int (*func)(type *,unsigned char **), int ex_tag, \
+			   int ex_class, int is_set); \
+STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
+				       long length, \
+				       type *(*func)(type **, \
+						     unsigned char **,long), \
+				       void (*free_func)(type *), \
+				       int ex_tag,int ex_class);
+
+#define IMPLEMENT_ASN1_SET_OF(type) \
+int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
+			   int (*func)(type *,unsigned char **), int ex_tag, \
+			   int ex_class, int is_set) \
+    { return i2d_ASN1_SET((STACK *)a,pp,func,ex_tag,ex_class,is_set); } \
+STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
+				       long length, \
+				       type *(*func)(type **, \
+						     unsigned char **,long), \
+				       void (*free_func)(type *), \
+				       int ex_tag,int ex_class) \
+    { return (STACK_OF(type) *)d2i_ASN1_SET((STACK **)a,pp,length, \
+					    (char *(*)())func, \
+					    (void (*)())free_func, \
+					    ex_tag,ex_class); }
+
 #ifdef HEADER_BIO_H
 int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
 int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h
index 41bf4072a2..3aeedc18a6 100644
--- a/crypto/asn1/asn1_mac.h
+++ b/crypto/asn1/asn1_mac.h
@@ -180,6 +180,15 @@ err:\
 			tag,V_ASN1_CONTEXT_SPECIFIC); \
 		}
 
+#define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
+	if ((c.slen != 0) && \
+		(M_ASN1_next == \
+		(V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
+		{ \
+		M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
+			tag,V_ASN1_CONTEXT_SPECIFIC); \
+		}
+
 #define M_ASN1_D2I_get_seq(r,func,free_func) \
 		M_ASN1_D2I_get_imp_set(r,func,free_func,\
 			V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
@@ -200,6 +209,13 @@ err:\
 		{ c.line=__LINE__; goto err; } \
 	c.slen-=(c.p-c.q);
 
+#define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
+	c.q=c.p; \
+	if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,free_func,a,b) \
+	    == NULL) \
+		{ c.line=__LINE__; goto err; } \
+	c.slen-=(c.p-c.q);
+
 #define M_ASN1_D2I_get_set_strings(r,func,a,b) \
 	c.q=c.p; \
 	if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
@@ -314,6 +330,12 @@ err:\
 			ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
 					  IS_SEQUENCE);
 
+#define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
+		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
+			ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
+						    V_ASN1_CONTEXT_SPECIFIC, \
+						    IS_SEQUENCE);
+
 #define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
 		if (a != NULL)\
 			{ \
@@ -371,6 +393,12 @@ err:\
 			{ i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
 				       IS_SEQUENCE); }
 
+#define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
+		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
+			{ i2d_ASN1_SET_OF_##type(a,&p,f,x, \
+						 V_ASN1_CONTEXT_SPECIFIC, \
+						 IS_SEQUENCE); }
+
 #define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
 		if (a != NULL) \
 			{ \
diff --git a/crypto/asn1/p7_s_e.c b/crypto/asn1/p7_s_e.c
index 72f5b6503b..8271c8f8e3 100644
--- a/crypto/asn1/p7_s_e.c
+++ b/crypto/asn1/p7_s_e.c
@@ -76,7 +76,7 @@ unsigned char **pp;
 	M_ASN1_I2D_len_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
 	M_ASN1_I2D_len_SET(a->md_algs,i2d_X509_ALGOR);
 	M_ASN1_I2D_len(a->enc_data,i2d_PKCS7_ENC_CONTENT);
-	M_ASN1_I2D_len_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+	M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
 	M_ASN1_I2D_len_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
 	M_ASN1_I2D_len_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -86,7 +86,7 @@ unsigned char **pp;
 	M_ASN1_I2D_put_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
 	M_ASN1_I2D_put_SET(a->md_algs,i2d_X509_ALGOR);
 	M_ASN1_I2D_put(a->enc_data,i2d_PKCS7_ENC_CONTENT);
-	M_ASN1_I2D_put_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+	M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
 	M_ASN1_I2D_put_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
 	M_ASN1_I2D_put_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -107,7 +107,7 @@ long length;
 		PKCS7_RECIP_INFO_free);
 	M_ASN1_D2I_get_set(ret->md_algs,d2i_X509_ALGOR,X509_ALGOR_free);
 	M_ASN1_D2I_get(ret->enc_data,d2i_PKCS7_ENC_CONTENT);
-	M_ASN1_D2I_get_IMP_set_opt(ret->cert,d2i_X509,X509_free,0);
+	M_ASN1_D2I_get_IMP_set_opt_type(X509,ret->cert,d2i_X509,X509_free,0);
 	M_ASN1_D2I_get_IMP_set_opt(ret->crl,d2i_X509_CRL,X509_CRL_free,1);
 	M_ASN1_D2I_get_set(ret->signer_info,d2i_PKCS7_SIGNER_INFO,
 		PKCS7_SIGNER_INFO_free);
@@ -141,7 +141,7 @@ PKCS7_SIGN_ENVELOPE *a;
 	sk_pop_free(a->recipientinfo,PKCS7_RECIP_INFO_free);
 	sk_pop_free(a->md_algs,X509_ALGOR_free);
 	PKCS7_ENC_CONTENT_free(a->enc_data);
-	sk_pop_free(a->cert,X509_free);
+	sk_X509_pop_free(a->cert,X509_free);
 	sk_pop_free(a->crl,X509_CRL_free);
 	sk_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
 	Free((char *)a);
diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c
index cefa92a212..f4d03f8b89 100644
--- a/crypto/asn1/p7_signd.c
+++ b/crypto/asn1/p7_signd.c
@@ -75,7 +75,7 @@ unsigned char **pp;
 	M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
 	M_ASN1_I2D_len_SET(a->md_algs,i2d_X509_ALGOR);
 	M_ASN1_I2D_len(a->contents,i2d_PKCS7);
-	M_ASN1_I2D_len_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+	M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
 	M_ASN1_I2D_len_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
 	M_ASN1_I2D_len_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -84,7 +84,7 @@ unsigned char **pp;
 	M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
 	M_ASN1_I2D_put_SET(a->md_algs,i2d_X509_ALGOR);
 	M_ASN1_I2D_put(a->contents,i2d_PKCS7);
-	M_ASN1_I2D_put_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+	M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
 	M_ASN1_I2D_put_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
 	M_ASN1_I2D_put_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -103,7 +103,7 @@ long length;
 	M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
 	M_ASN1_D2I_get_set(ret->md_algs,d2i_X509_ALGOR,X509_ALGOR_free);
 	M_ASN1_D2I_get(ret->contents,d2i_PKCS7);
-	M_ASN1_D2I_get_IMP_set_opt(ret->cert,d2i_X509,X509_free,0);
+	M_ASN1_D2I_get_IMP_set_opt_type(X509,ret->cert,d2i_X509,X509_free,0);
 	M_ASN1_D2I_get_IMP_set_opt(ret->crl,d2i_X509_CRL,X509_CRL_free,1);
 	M_ASN1_D2I_get_set(ret->signer_info,d2i_PKCS7_SIGNER_INFO,
 		PKCS7_SIGNER_INFO_free);
@@ -134,7 +134,7 @@ PKCS7_SIGNED *a;
 	ASN1_INTEGER_free(a->version);
 	sk_pop_free(a->md_algs,X509_ALGOR_free);
 	PKCS7_free(a->contents);
-	sk_pop_free(a->cert,X509_free);
+	sk_X509_pop_free(a->cert,X509_free);
 	sk_pop_free(a->crl,X509_CRL_free);
 	sk_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
 	Free((char *)a);