Break circular dependency between pem and err.

1 files changed, 109 insertions, 95 deletions

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index e20e826121..47ed3cccdc 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -145,19 +145,21 @@ asn1pars.o: ../include/crypto.h ../include/des.h ../include/dh.h
 asn1pars.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 asn1pars.o: ../include/evp.h ../include/idea.h ../include/md2.h
 asn1pars.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-asn1pars.o: ../include/pem.h ../include/pkcs7.h ../include/rc2.h
-asn1pars.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-asn1pars.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-asn1pars.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+asn1pars.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
+asn1pars.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+asn1pars.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+asn1pars.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+asn1pars.o: 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
 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/pem.h ../include/pkcs7.h ../include/rc2.h
-ca.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ca.o: ../include/sha.h ../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/objects.h ../include/pem.h ../include/pem2.h
+ca.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ca.o: ../include/ripemd.h ../include/rsa.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
@@ -175,16 +177,17 @@ 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
 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 ../include/pem.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 apps.h progs.h
+crl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+crl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+crl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+crl.o: 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
 crl2p7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 crl2p7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-crl2p7.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-crl2p7.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+crl2p7.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+crl2p7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 crl2p7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 crl2p7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
 crl2p7.o: progs.h
@@ -193,45 +196,48 @@ 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
 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/pem.h ../include/pkcs7.h
-dgst.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-dgst.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-dgst.o: ../include/x509_vfy.h apps.h progs.h
+dgst.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+dgst.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+dgst.o: ../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
 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
 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 ../include/pem.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/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+dh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+dh.o: ../include/stack.h ../include/x509.h ../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
 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 ../include/pem.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/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+dsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+dsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+dsa.o: 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
 dsaparam.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 dsaparam.o: ../include/evp.h ../include/idea.h ../include/md2.h
 dsaparam.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-dsaparam.o: ../include/pem.h ../include/pkcs7.h ../include/rand.h
-dsaparam.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-dsaparam.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-dsaparam.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-dsaparam.o: progs.h
+dsaparam.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
+dsaparam.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
+dsaparam.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+dsaparam.o: ../include/sha.h ../include/stack.h ../include/x509.h
+dsaparam.o: ../include/x509_vfy.h apps.h 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
 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 ../include/pem.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/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+enc.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+enc.o: 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,9 +254,9 @@ 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
 gendh.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 gendh.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-gendh.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-gendh.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-gendh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+gendh.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+gendh.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h
+gendh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.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
@@ -258,69 +264,73 @@ 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
 gendsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 gendsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-gendsa.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-gendsa.o: ../include/rand.h ../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/objects.h ../include/pem.h ../include/pem2.h
+gendsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+gendsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+gendsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+gendsa.o: ../include/x509.h ../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
 genrsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 genrsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-genrsa.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-genrsa.o: ../include/rand.h ../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/objects.h ../include/pem.h ../include/pem2.h
+genrsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+genrsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+genrsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+genrsa.o: ../include/x509.h ../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
 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/pem.h ../include/pkcs7.h
-nseq.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-nseq.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-nseq.o: ../include/x509_vfy.h apps.h progs.h
+nseq.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+nseq.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+nseq.o: ../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
 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
 openssl.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 openssl.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 openssl.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-openssl.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-openssl.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-openssl.o: ../include/ripemd.h ../include/rsa.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
+openssl.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+openssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+openssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+openssl.o: ../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
 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
 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/pem.h ../include/pkcs7.h
-pkcs7.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-pkcs7.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-pkcs7.o: ../include/x509_vfy.h apps.h progs.h
+pkcs7.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+pkcs7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+pkcs7.o: ../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
 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
 req.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 req.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
-req.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-req.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-req.o: ../include/ripemd.h ../include/rsa.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
+req.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+req.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h
+req.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+req.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
+req.o: ../include/x509v3.h apps.h 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
 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 ../include/pem.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/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+rsa.o: 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
@@ -337,24 +347,26 @@ s_client.o: ../include/crypto.h ../include/des.h ../include/dh.h
 s_client.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 s_client.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s_client.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s_client.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-s_client.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s_client.o: ../include/ripemd.h ../include/rsa.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_client.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+s_client.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s_client.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s_client.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+s_client.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+s_client.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+s_client.o: 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
 s_server.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 s_server.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s_server.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s_server.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-s_server.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s_server.o: ../include/ripemd.h ../include/rsa.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_server.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+s_server.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s_server.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s_server.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+s_server.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+s_server.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+s_server.o: 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
@@ -373,23 +385,24 @@ s_time.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 s_time.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 s_time.o: ../include/lhash.h ../include/md2.h ../include/md5.h
 s_time.o: ../include/mdc2.h ../include/objects.h ../include/pem.h
-s_time.o: ../include/pkcs7.h ../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/pem2.h ../include/pkcs7.h ../include/rc2.h
+s_time.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s_time.o: ../include/rsa.h ../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
 sess_id.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h
 sess_id.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 sess_id.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-sess_id.o: ../include/pem.h ../include/pkcs7.h ../include/rc2.h
-sess_id.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-sess_id.o: ../include/rsa.h ../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/pem.h ../include/pem2.h ../include/pkcs7.h
+sess_id.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+sess_id.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+sess_id.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+sess_id.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+sess_id.o: ../include/x509.h ../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
@@ -404,8 +417,8 @@ 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
 verify.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 verify.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-verify.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h
-verify.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+verify.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+verify.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 verify.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 verify.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
 verify.o: progs.h
@@ -422,7 +435,8 @@ x509.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 x509.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 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/pem.h ../include/pkcs7.h
-x509.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-x509.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-x509.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
+x509.o: ../include/objects.h ../include/pem.h ../include/pem2.h
+x509.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+x509.o: ../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