Add type-safe STACKs and SETs.

6 files changed, 122 insertions, 108 deletions

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index e9c22d15f2..b3852e1c01 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -149,8 +149,8 @@ asn1pars.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 asn1pars.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 asn1pars.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
 asn1pars.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-asn1pars.o: ../include/sha.h ../include/stack.h ../include/x509.h
-asn1pars.o: ../include/x509_vfy.h apps.h progs.h
+asn1pars.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+asn1pars.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 ca.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 ca.o: ../include/buffer.h ../include/cast.h ../include/conf.h
 ca.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -158,9 +158,10 @@ ca.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 ca.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
 ca.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 ca.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ca.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-ca.o: ../include/stack.h ../include/txt_db.h ../include/x509.h
-ca.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
+ca.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ca.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ca.o: ../include/txt_db.h ../include/x509.h ../include/x509_vfy.h
+ca.o: ../include/x509v3.h apps.h progs.h
 ciphers.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ciphers.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ciphers.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -169,10 +170,10 @@ ciphers.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 ciphers.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 ciphers.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
 ciphers.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ciphers.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
-ciphers.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-ciphers.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-ciphers.o: progs.h
+ciphers.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+ciphers.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+ciphers.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+ciphers.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 crl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 crl.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 crl.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
@@ -180,9 +181,9 @@ crl.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 crl.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 crl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-crl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-crl.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h
-crl.o: progs.h
+crl.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+crl.o: ../include/sha.h ../include/stack.h ../include/x509.h
+crl.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
 crl2p7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 crl2p7.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 crl2p7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -191,8 +192,9 @@ crl2p7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 crl2p7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 crl2p7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
 crl2p7.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-crl2p7.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-crl2p7.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+crl2p7.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+crl2p7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+crl2p7.o: progs.h
 dgst.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 dgst.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 dgst.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -200,9 +202,9 @@ dgst.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 dgst.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 dgst.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 dgst.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-dgst.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-dgst.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-dgst.o: progs.h
+dgst.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+dgst.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+dgst.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 dh.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 dh.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 dh.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
@@ -210,8 +212,9 @@ dh.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 dh.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 dh.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-dh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-dh.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+dh.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+dh.o: ../include/sha.h ../include/stack.h ../include/x509.h
+dh.o: ../include/x509_vfy.h apps.h progs.h
 dsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 dsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 dsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
@@ -219,8 +222,9 @@ dsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 dsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 dsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-dsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-dsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+dsa.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+dsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
+dsa.o: ../include/x509_vfy.h apps.h progs.h
 dsaparam.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 dsaparam.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 dsaparam.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -230,8 +234,9 @@ dsaparam.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 dsaparam.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 dsaparam.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
 dsaparam.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-dsaparam.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-dsaparam.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+dsaparam.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+dsaparam.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+dsaparam.o: progs.h
 enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 enc.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
@@ -239,8 +244,9 @@ enc.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 enc.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-enc.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+enc.o: ../include/sha.h ../include/stack.h ../include/x509.h
+enc.o: ../include/x509_vfy.h apps.h progs.h
 errstr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 errstr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 errstr.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -248,10 +254,11 @@ errstr.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 errstr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
 errstr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
 errstr.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-errstr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-errstr.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
-errstr.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
-errstr.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+errstr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+errstr.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+errstr.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+errstr.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+errstr.o: progs.h
 gendh.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 gendh.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 gendh.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -260,8 +267,9 @@ gendh.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 gendh.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 gendh.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
 gendh.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-gendh.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-gendh.o: ../include/x509_vfy.h apps.h progs.h
+gendh.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+gendh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+gendh.o: progs.h
 gendsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 gendsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 gendsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -270,9 +278,9 @@ gendsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 gendsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 gendsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
 gendsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-gendsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-gendsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-gendsa.o: progs.h
+gendsa.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+gendsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
+gendsa.o: ../include/x509_vfy.h apps.h progs.h
 genrsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 genrsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 genrsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -281,9 +289,9 @@ genrsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 genrsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 genrsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
 genrsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-genrsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-genrsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-genrsa.o: progs.h
+genrsa.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+genrsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
+genrsa.o: ../include/x509_vfy.h apps.h progs.h
 nseq.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 nseq.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 nseq.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -291,9 +299,9 @@ nseq.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 nseq.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 nseq.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 nseq.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-nseq.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-nseq.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-nseq.o: progs.h
+nseq.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+nseq.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+nseq.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 openssl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 openssl.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 openssl.o: ../include/conf.h ../include/crypto.h ../include/des.h
@@ -303,10 +311,10 @@ openssl.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 openssl.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 openssl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
 openssl.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-openssl.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
-openssl.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-openssl.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-openssl.o: progs.h s_apps.h
+openssl.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+openssl.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+openssl.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+openssl.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
 pkcs7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 pkcs7.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 pkcs7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -314,9 +322,9 @@ pkcs7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 pkcs7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 pkcs7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 pkcs7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-pkcs7.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-pkcs7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-pkcs7.o: progs.h
+pkcs7.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+pkcs7.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+pkcs7.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 req.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 req.o: ../include/buffer.h ../include/cast.h ../include/conf.h
 req.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -325,8 +333,9 @@ req.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
 req.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 req.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h ../include/rc2.h
 req.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-req.o: ../include/sha.h ../include/stack.h ../include/x509.h
-req.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
+req.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+req.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h
+req.o: progs.h
 rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 rsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 rsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
@@ -334,8 +343,9 @@ rsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 rsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-rsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-rsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+rsa.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+rsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
+rsa.o: ../include/x509_vfy.h apps.h progs.h
 s_cb.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_cb.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_cb.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -343,10 +353,10 @@ s_cb.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 s_cb.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
 s_cb.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
 s_cb.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s_cb.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
-s_cb.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-s_cb.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-s_cb.o: progs.h s_apps.h
+s_cb.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s_cb.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
+s_cb.o: ../include/stack.h ../include/tls1.h ../include/x509.h
+s_cb.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_client.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_client.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_client.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -356,10 +366,10 @@ s_client.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 s_client.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 s_client.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
 s_client.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s_client.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
-s_client.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
-s_client.o: ../include/stack.h ../include/tls1.h ../include/x509.h
-s_client.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
+s_client.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s_client.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+s_client.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+s_client.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_server.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_server.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_server.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -369,10 +379,10 @@ s_server.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 s_server.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 s_server.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
 s_server.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s_server.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
-s_server.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
-s_server.o: ../include/stack.h ../include/tls1.h ../include/x509.h
-s_server.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
+s_server.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s_server.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+s_server.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+s_server.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_socket.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_socket.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_socket.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -381,10 +391,10 @@ s_socket.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 s_socket.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 s_socket.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
 s_socket.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s_socket.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
-s_socket.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
-s_socket.o: ../include/stack.h ../include/tls1.h ../include/x509.h
-s_socket.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
+s_socket.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s_socket.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+s_socket.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+s_socket.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_time.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_time.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_time.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -393,10 +403,11 @@ s_time.o: ../include/lhash.h ../include/md2.h ../include/md5.h
 s_time.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
 s_time.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
 s_time.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s_time.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-s_time.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
-s_time.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
-s_time.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
+s_time.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+s_time.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+s_time.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+s_time.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+s_time.o: progs.h s_apps.h
 sess_id.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 sess_id.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 sess_id.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -406,10 +417,10 @@ sess_id.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 sess_id.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
 sess_id.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
 sess_id.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-sess_id.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
-sess_id.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-sess_id.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-sess_id.o: progs.h
+sess_id.o: ../include/safestack.h ../include/sha.h ../include/ssl.h
+sess_id.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
+sess_id.o: ../include/stack.h ../include/tls1.h ../include/x509.h
+sess_id.o: ../include/x509_vfy.h apps.h progs.h
 speed.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 speed.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 speed.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -417,9 +428,9 @@ speed.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/hmac.h
 speed.o: ../include/idea.h ../include/md2.h ../include/md5.h ../include/mdc2.h
 speed.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
 speed.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-speed.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-speed.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ./testdsa.h
-speed.o: ./testrsa.h apps.h progs.h
+speed.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+speed.o: ../include/sha.h ../include/stack.h ../include/x509.h
+speed.o: ../include/x509_vfy.h ./testdsa.h ./testrsa.h apps.h progs.h
 verify.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 verify.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 verify.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
@@ -428,8 +439,9 @@ verify.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 verify.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 verify.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
 verify.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-verify.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-verify.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+verify.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+verify.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+verify.o: progs.h
 version.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 version.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 version.o: ../include/crypto.h ../include/des.h ../include/dh.h
@@ -446,6 +458,7 @@ x509.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 x509.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
 x509.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
 x509.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-x509.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-x509.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
-x509.o: ../include/x509v3.h apps.h progs.h
+x509.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+x509.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+x509.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h
+x509.o: progs.h
diff --git a/apps/ciphers.c b/apps/ciphers.c
index 867196e393..a62c5b0e8a 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -89,7 +89,7 @@ char **argv;
 	SSL *ssl=NULL;
 	char *ciphers=NULL;
 	SSL_METHOD *meth=NULL;
-	STACK *sk;
+	STACK_OF(SSL_CIPHER) *sk;
 	char buf[512];
 	BIO *STDout=NULL;
 
@@ -167,10 +167,10 @@ char **argv;
 		{
 		sk=SSL_get_ciphers(ssl);
 
-		for (i=0; i<sk_num(sk); i++)
+		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
 			{
 			BIO_puts(STDout,SSL_CIPHER_description(
-				(SSL_CIPHER *)sk_value(sk,i),
+				sk_SSL_CIPHER_value(sk,i),
 				buf,512));
 			}
 		}
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index befae045ce..beadc96caf 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -73,7 +73,7 @@
 #include "objects.h"
 
 #ifndef NOPROTO
-static int add_certs_from_file(STACK *stack, char *certfile);
+static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #else
 static int add_certs_from_file();
 #endif
@@ -100,7 +100,7 @@ char **argv;
 	X509_CRL *crl=NULL;
 	STACK *certflst=NULL;
 	STACK *crl_stack=NULL;
-	STACK *cert_stack=NULL;
+	STACK_OF(X509) *cert_stack=NULL;
 	int ret=1,nocrl=0;
 
 	apps_startup();
@@ -228,7 +228,7 @@ bad:
 		crl=NULL; /* now part of p7 for Freeing */
 		}
 
-	if ((cert_stack=sk_new(NULL)) == NULL) goto end;
+	if ((cert_stack=sk_X509_new(NULL)) == NULL) goto end;
 	p7s->cert=cert_stack;
 
 	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
@@ -289,7 +289,7 @@ end:
  *----------------------------------------------------------------------
  */
 static int add_certs_from_file(stack,certfile)
-STACK *stack;
+STACK_OF(X509) *stack;
 char *certfile;
 	{
 	struct stat st;
@@ -325,7 +325,7 @@ char *certfile;
 		xi=(X509_INFO *)sk_shift(sk);
 		if (xi->x509 != NULL)
 			{
-			sk_push(stack,(char *)xi->x509);
+			sk_X509_push(stack,xi->x509);
 			xi->x509=NULL;
 			count++;
 			}
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 9f96edc565..cac75f48b2 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -223,7 +223,7 @@ bad:
 
 	if (print_certs)
 		{
-		STACK *certs=NULL;
+		STACK_OF(X509) *certs=NULL;
 		STACK *crls=NULL;
 
 		i=OBJ_obj2nid(p7->type);
@@ -245,9 +245,9 @@ bad:
 			{
 			X509 *x;
 
-			for (i=0; i<sk_num(certs); i++)
+			for (i=0; i<sk_X509_num(certs); i++)
 				{
-				x=(X509 *)sk_value(certs,i);
+				x=sk_X509_value(certs,i);
 
 				X509_NAME_oneline(X509_get_subject_name(x),
 					buf,256);
diff --git a/apps/s_client.c b/apps/s_client.c
index c6b7938de3..7140f8ba2b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -666,7 +666,8 @@ int full;
 	char *p;
 	static char *space="                ";
 	char buf[BUFSIZ];
-	STACK *sk;
+	STACK_OF(X509) *sk;
+	STACK_OF(X509_NAME) *sk2;
 	SSL_CIPHER *c;
 	X509_NAME *xn;
 	int j,i;
@@ -677,16 +678,16 @@ int full;
 		if (sk != NULL)
 			{
 			BIO_printf(bio,"---\nCertificate chain\n");
-			for (i=0; i<sk_num(sk); i++)
+			for (i=0; i<sk_X509_num(sk); i++)
 				{
-				X509_NAME_oneline(X509_get_subject_name((X509 *)
-					sk_value(sk,i)),buf,BUFSIZ);
+				X509_NAME_oneline(X509_get_subject_name(
+					sk_X509_value(sk,i)),buf,BUFSIZ);
 				BIO_printf(bio,"%2d s:%s\n",i,buf);
-				X509_NAME_oneline(X509_get_issuer_name((X509 *)
-					sk_value(sk,i)),buf,BUFSIZ);
+				X509_NAME_oneline(X509_get_issuer_name(
+					sk_X509_value(sk,i)),buf,BUFSIZ);
 				BIO_printf(bio,"   i:%s\n",buf);
 				if (c_showcerts)
-					PEM_write_bio_X509(bio,(X509 *) sk_value(sk,i));
+					PEM_write_bio_X509(bio,sk_X509_value(sk,i));
 				}
 			}
 
@@ -707,13 +708,13 @@ int full;
 		else
 			BIO_printf(bio,"no peer certificate available\n");
 
-		sk=SSL_get_client_CA_list(s);
-		if ((sk != NULL) && (sk_num(sk) > 0))
+		sk2=SSL_get_client_CA_list(s);
+		if ((sk != NULL) && (sk_X509_NAME_num(sk2) > 0))
 			{
 			BIO_printf(bio,"---\nAcceptable client certificate CA names\n");
-			for (i=0; i<sk_num(sk); i++)
+			for (i=0; i<sk_X509_NAME_num(sk2); i++)
 				{
-				xn=(X509_NAME *)sk_value(sk,i);
+				xn=sk_X509_NAME_value(sk2,i);
 				X509_NAME_oneline(xn,buf,sizeof(buf));
 				BIO_write(bio,buf,strlen(buf));
 				BIO_write(bio,"\n",1);
diff --git a/apps/s_server.c b/apps/s_server.c
index 7d9df46085..de0c712109 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -998,7 +998,7 @@ char *context;
 			{
 			char *p;
 			X509 *peer;
-			STACK *sk;
+			STACK_OF(SSL_CIPHER) *sk;
 			static char *space="                          ";
 
 			BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
@@ -1017,10 +1017,10 @@ char *context;
 			 * be done */
 			BIO_printf(io,"Ciphers supported in s_server binary\n");
 			sk=SSL_get_ciphers(con);
-			j=sk_num(sk);
+			j=sk_SSL_CIPHER_num(sk);
 			for (i=0; i<j; i++)
 				{
-				c=(SSL_CIPHER *)sk_value(sk,i);
+				c=sk_SSL_CIPHER_value(sk,i);
 				BIO_printf(io,"%-11s:%-25s",
 					SSL_CIPHER_get_version(c),
 					SSL_CIPHER_get_name(c));