Get rid of the cast.

4 files changed, 48 insertions, 10 deletions

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 5d632390c8..b4cd2c2d2a 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -191,7 +191,8 @@ ciphers.o: ../include/openssl/evp.h ../include/openssl/idea.h
 ciphers.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 ciphers.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 ciphers.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ciphers.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+ciphers.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ciphers.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ciphers.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ciphers.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -330,7 +331,8 @@ errstr.o: ../include/openssl/evp.h ../include/openssl/idea.h
 errstr.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 errstr.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 errstr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-errstr.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+errstr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 errstr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 errstr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 errstr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -493,7 +495,8 @@ s_cb.o: ../include/openssl/evp.h ../include/openssl/idea.h
 s_cb.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 s_cb.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 s_cb.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_cb.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+s_cb.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_cb.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s_cb.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 s_cb.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -552,6 +555,7 @@ s_socket.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s_socket.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s_socket.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s_socket.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s_socket.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 4270862d68..d6370521be 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -486,7 +486,7 @@ void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len)
 #endif
 #if defined(HASH_BLOCK_DATA_ORDER)
 			{
-			HASH_BLOCK_DATA_ORDER(c,(const unsigned char *)data,sw);
+			HASH_BLOCK_DATA_ORDER(c,data,sw);
 			sw*=HASH_CBLOCK;
 			data+=sw;
 			len-=sw;
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl
index 942d3e8da6..03dd5c53de 100644
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -104,7 +104,8 @@ bio_ssl.o: ../include/openssl/evp.h ../include/openssl/idea.h
 bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 bio_ssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+bio_ssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 bio_ssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 bio_ssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 bio_ssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -124,6 +125,7 @@ s23_clnt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s23_clnt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s23_clnt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s23_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s23_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s23_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s23_clnt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s23_clnt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -144,6 +146,7 @@ s23_lib.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s23_lib.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s23_lib.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s23_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s23_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s23_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s23_lib.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s23_lib.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -163,6 +166,7 @@ s23_meth.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s23_meth.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s23_meth.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s23_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s23_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s23_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s23_meth.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s23_meth.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -182,6 +186,7 @@ s23_pkt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s23_pkt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s23_pkt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s23_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s23_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s23_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s23_pkt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s23_pkt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -201,6 +206,7 @@ s23_srvr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s23_srvr.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s23_srvr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s23_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s23_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s23_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s23_srvr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s23_srvr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -221,6 +227,7 @@ s2_clnt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_clnt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_clnt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s2_clnt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s2_clnt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -241,6 +248,7 @@ s2_enc.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_enc.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_enc.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s2_enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s2_enc.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -260,6 +268,7 @@ s2_lib.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_lib.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_lib.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s2_lib.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s2_lib.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -279,6 +288,7 @@ s2_meth.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_meth.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_meth.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s2_meth.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s2_meth.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -298,6 +308,7 @@ s2_pkt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_pkt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_pkt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s2_pkt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s2_pkt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -317,6 +328,7 @@ s2_srvr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s2_srvr.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s2_srvr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s2_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s2_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s2_srvr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s2_srvr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -337,6 +349,7 @@ s3_both.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_both.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_both.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_both.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_both.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_both.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s3_both.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s3_both.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -357,6 +370,7 @@ s3_clnt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_clnt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_clnt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s3_clnt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s3_clnt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -377,6 +391,7 @@ s3_enc.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_enc.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_enc.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s3_enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s3_enc.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -396,6 +411,7 @@ s3_lib.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_lib.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_lib.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s3_lib.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s3_lib.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -415,6 +431,7 @@ s3_meth.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_meth.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_meth.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s3_meth.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s3_meth.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -434,6 +451,7 @@ s3_pkt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_pkt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_pkt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s3_pkt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 s3_pkt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -453,6 +471,7 @@ s3_srvr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 s3_srvr.o: ../include/openssl/md2.h ../include/openssl/md5.h
 s3_srvr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 s3_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 s3_srvr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 s3_srvr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -473,6 +492,7 @@ ssl_algs.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_algs.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_algs.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_algs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_algs.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_algs.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_algs.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 ssl_algs.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -492,7 +512,8 @@ ssl_asn1.o: ../include/openssl/evp.h ../include/openssl/idea.h
 ssl_asn1.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 ssl_asn1.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 ssl_asn1.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_asn1.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+ssl_asn1.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ssl_asn1.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_asn1.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ssl_asn1.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ssl_asn1.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -532,6 +553,7 @@ ssl_ciph.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_ciph.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_ciph.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_ciph.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_ciph.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_ciph.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_ciph.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 ssl_ciph.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -550,7 +572,8 @@ ssl_err.o: ../include/openssl/evp.h ../include/openssl/idea.h
 ssl_err.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 ssl_err.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 ssl_err.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ssl_err.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_err.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ssl_err.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ssl_err.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -569,7 +592,8 @@ ssl_err2.o: ../include/openssl/evp.h ../include/openssl/idea.h
 ssl_err2.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 ssl_err2.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 ssl_err2.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ssl_err2.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_err2.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ssl_err2.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ssl_err2.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -589,6 +613,7 @@ ssl_lib.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_lib.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_lib.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_lib.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 ssl_lib.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -628,6 +653,7 @@ ssl_sess.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_sess.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_sess.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_sess.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_sess.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_sess.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 ssl_sess.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ssl_sess.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -648,6 +674,7 @@ ssl_stat.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_stat.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_stat.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_stat.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_stat.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_stat.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_stat.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 ssl_stat.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -667,6 +694,7 @@ ssl_txt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 ssl_txt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 ssl_txt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 ssl_txt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_txt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_txt.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_txt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 ssl_txt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -686,6 +714,7 @@ t1_clnt.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 t1_clnt.o: ../include/openssl/md2.h ../include/openssl/md5.h
 t1_clnt.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 t1_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+t1_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 t1_clnt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 t1_clnt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
@@ -706,7 +735,8 @@ t1_enc.o: ../include/openssl/hmac.h ../include/openssl/idea.h
 t1_enc.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 t1_enc.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+t1_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_enc.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 t1_enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 t1_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -726,6 +756,7 @@ t1_lib.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 t1_lib.o: ../include/openssl/md2.h ../include/openssl/md5.h
 t1_lib.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 t1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+t1_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 t1_lib.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 t1_lib.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -745,6 +776,7 @@ t1_meth.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 t1_meth.o: ../include/openssl/md2.h ../include/openssl/md5.h
 t1_meth.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 t1_meth.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+t1_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 t1_meth.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 t1_meth.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
@@ -764,6 +796,7 @@ t1_srvr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
 t1_srvr.o: ../include/openssl/md2.h ../include/openssl/md5.h
 t1_srvr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
 t1_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+t1_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 t1_srvr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 t1_srvr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 156e64563a..f11da2ec60 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -375,7 +375,8 @@ ssltest.o: ../include/openssl/evp.h ../include/openssl/idea.h
 ssltest.o: ../include/openssl/lhash.h ../include/openssl/md2.h
 ssltest.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 ssltest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssltest.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+ssltest.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ssltest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h