Work with -pedantic!

12 files changed, 427 insertions, 408 deletions

diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl
index 0a499ffbbc..882b6ed8bf 100644
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -100,278 +100,290 @@ $(ERRC).c: $(ERR).err
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-bio_ssl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-bio_ssl.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-bio_ssl.o: ../include/crypto.h ../include/des.h ../include/dh.h
-bio_ssl.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h
-bio_ssl.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-bio_ssl.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
-bio_ssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-bio_ssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-bio_ssl.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-bio_ssl.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-bio_ssl.o: tls1.h
-s23_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s23_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s23_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s23_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s23_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s23_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s23_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
-s23_clnt.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s23_clnt.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-s23_clnt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s23_clnt.o: ssl_locl.h tls1.h
-s23_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s23_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s23_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s23_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s23_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s23_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s23_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s23_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s23_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s23_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s23_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s23_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s23_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s23_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s23_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s23_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s23_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s23_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s23_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s23_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s23_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s23_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s23_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s23_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s23_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s23_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s23_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s23_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s23_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s23_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s23_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s23_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s23_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s23_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s23_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s23_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s23_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
-s23_srvr.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s23_srvr.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-s23_srvr.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s23_srvr.o: ssl_locl.h tls1.h
-s2_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s2_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s2_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s2_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s2_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+bio_ssl.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+bio_ssl.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+bio_ssl.o: ../include/cast.h ../include/crypto.h ../include/des.h
+bio_ssl.o: ../include/dh.h ../include/dsa.h ../include/err.h ../include/evp.h
+bio_ssl.o: ../include/idea.h ../include/lhash.h ../include/md2.h
+bio_ssl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+bio_ssl.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+bio_ssl.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+bio_ssl.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+bio_ssl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+bio_ssl.o: ssl2.h ssl23.h ssl3.h tls1.h
+s23_clnt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s23_clnt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s23_clnt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s23_clnt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s23_clnt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s23_clnt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s23_clnt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s23_clnt.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s23_clnt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s23_clnt.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s23_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s23_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s23_lib.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s23_lib.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s23_lib.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s23_lib.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s23_lib.o: ../include/err.h ../include/evp.h ../include/idea.h
+s23_lib.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s23_lib.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s23_lib.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s23_lib.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s23_lib.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+s23_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+s23_lib.o: ssl_locl.h tls1.h
+s23_meth.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s23_meth.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s23_meth.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s23_meth.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s23_meth.o: ../include/err.h ../include/evp.h ../include/idea.h
+s23_meth.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s23_meth.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s23_meth.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s23_meth.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s23_meth.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+s23_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+s23_meth.o: ssl_locl.h tls1.h
+s23_pkt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s23_pkt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s23_pkt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s23_pkt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s23_pkt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s23_pkt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s23_pkt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s23_pkt.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s23_pkt.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s23_pkt.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+s23_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+s23_pkt.o: ssl_locl.h tls1.h
+s23_srvr.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s23_srvr.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s23_srvr.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s23_srvr.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s23_srvr.o: ../include/err.h ../include/evp.h ../include/idea.h
+s23_srvr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s23_srvr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s23_srvr.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s23_srvr.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s23_srvr.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s23_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s23_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s2_clnt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_clnt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_clnt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_clnt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_clnt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_clnt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_clnt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_clnt.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s2_clnt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s2_clnt.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s2_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s2_enc.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_enc.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_enc.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_enc.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_enc.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_enc.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s2_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s2_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s2_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s2_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_lib.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_lib.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_lib.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_lib.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_lib.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_lib.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_lib.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_lib.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s2_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s2_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s2_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s2_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s2_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s2_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s2_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s2_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_meth.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_meth.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_meth.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_meth.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_meth.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_meth.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_meth.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_meth.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s2_meth.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s2_meth.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+s2_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+s2_meth.o: ssl_locl.h tls1.h
+s2_pkt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_pkt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_pkt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_pkt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_pkt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_pkt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_pkt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_pkt.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s2_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s2_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s2_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s2_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s2_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s2_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s2_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s2_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s2_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s2_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s2_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s2_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s2_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_both.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_both.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_both.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_both.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_both.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_both.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_both.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_both.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s3_both.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s3_both.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s3_both.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s3_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s3_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s3_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_srvr.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s2_srvr.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s2_srvr.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s2_srvr.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s2_srvr.o: ../include/err.h ../include/evp.h ../include/idea.h
+s2_srvr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s2_srvr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s2_srvr.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s2_srvr.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s2_srvr.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s2_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s3_both.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_both.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_both.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_both.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_both.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_both.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_both.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_both.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s3_both.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s3_both.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s3_both.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_both.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s3_clnt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_clnt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_clnt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_clnt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_clnt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_clnt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_clnt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_clnt.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s3_clnt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s3_clnt.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s3_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s3_enc.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_enc.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_enc.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_enc.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_enc.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_enc.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s3_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s3_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_lib.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_lib.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_lib.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_lib.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_lib.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_lib.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_lib.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_lib.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s3_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s3_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s3_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s3_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s3_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_meth.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_meth.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_meth.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_meth.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_meth.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_meth.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_meth.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_meth.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+s3_meth.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s3_meth.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+s3_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+s3_meth.o: ssl_locl.h tls1.h
+s3_pkt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_pkt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_pkt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_pkt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_pkt.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_pkt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_pkt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_pkt.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 s3_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h
 s3_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-s3_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-s3_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-s3_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
-s3_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-s3_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-s3_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-s3_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s3_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-s3_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h
-s3_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_algs.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_algs.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_algs.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_algs.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_algs.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_algs.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_algs.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_algs.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_algs.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-ssl_algs.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_algs.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_asn1.o: ../include/asn1.h ../include/asn1_mac.h ../include/bio.h
-ssl_asn1.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
-ssl_asn1.o: ../include/cast.h ../include/comp.h ../include/crypto.h
-ssl_asn1.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
-ssl_asn1.o: ../include/err.h ../include/evp.h ../include/idea.h
-ssl_asn1.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-ssl_asn1.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
-ssl_asn1.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssl_asn1.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_asn1.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-ssl_asn1.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_asn1.o: ssl_locl.h tls1.h
-ssl_cert.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_cert.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_cert.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_cert.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_cert.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_cert.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_cert.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
-ssl_cert.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
-ssl_cert.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_cert.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
-ssl_cert.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-ssl_cert.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_ciph.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_ciph.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_ciph.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_ciph.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_ciph.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_ciph.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_ciph.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_ciph.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_ciph.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-ssl_ciph.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_ciph.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_err.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_err.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_err.o: ../include/crypto.h ../include/des.h ../include/dh.h
-ssl_err.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h
-ssl_err.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-ssl_err.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
-ssl_err.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssl_err.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_err.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-ssl_err.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_err.o: tls1.h
-ssl_err2.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_err2.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_err2.o: ../include/crypto.h ../include/des.h ../include/dh.h
-ssl_err2.o: ../include/dsa.h ../include/err.h ../include/evp.h
+s3_srvr.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+s3_srvr.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+s3_srvr.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+s3_srvr.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+s3_srvr.o: ../include/err.h ../include/evp.h ../include/idea.h
+s3_srvr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+s3_srvr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s3_srvr.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+s3_srvr.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s3_srvr.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+s3_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_algs.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_algs.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_algs.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_algs.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_algs.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_algs.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_algs.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_algs.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_algs.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_algs.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ssl_algs.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_algs.o: ssl_locl.h tls1.h
+ssl_asn1.o: ../crypto/opensslconf.h ../include/asn1.h ../include/asn1_mac.h
+ssl_asn1.o: ../include/bio.h ../include/blowfish.h ../include/bn.h
+ssl_asn1.o: ../include/buffer.h ../include/cast.h ../include/comp.h
+ssl_asn1.o: ../include/crypto.h ../include/des.h ../include/dh.h
+ssl_asn1.o: ../include/dsa.h ../include/e_os.h ../include/err.h
+ssl_asn1.o: ../include/evp.h ../include/idea.h ../include/lhash.h
+ssl_asn1.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
+ssl_asn1.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_asn1.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_asn1.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+ssl_asn1.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_asn1.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_cert.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_cert.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_cert.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_cert.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_cert.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_cert.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_cert.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_cert.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
+ssl_cert.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_cert.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+ssl_cert.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_cert.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_ciph.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_ciph.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_ciph.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_ciph.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_ciph.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_ciph.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_ciph.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_ciph.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_ciph.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_ciph.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ssl_ciph.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_ciph.o: ssl_locl.h tls1.h
+ssl_err.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_err.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_err.o: ../include/cast.h ../include/crypto.h ../include/des.h
+ssl_err.o: ../include/dh.h ../include/dsa.h ../include/err.h ../include/evp.h
+ssl_err.o: ../include/idea.h ../include/lhash.h ../include/md2.h
+ssl_err.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+ssl_err.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+ssl_err.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssl_err.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+ssl_err.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_err.o: ssl2.h ssl23.h ssl3.h tls1.h
+ssl_err2.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_err2.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_err2.o: ../include/cast.h ../include/crypto.h ../include/des.h
+ssl_err2.o: ../include/dh.h ../include/dsa.h ../include/err.h ../include/evp.h
 ssl_err2.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 ssl_err2.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
 ssl_err2.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
@@ -379,115 +391,121 @@ ssl_err2.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
 ssl_err2.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
 ssl_err2.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 ssl_err2.o: ssl2.h ssl23.h ssl3.h tls1.h
-ssl_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-ssl_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_rsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_rsa.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_rsa.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_rsa.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_rsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_rsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
-ssl_rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
-ssl_rsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_rsa.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
-ssl_rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-ssl_rsa.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_sess.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_sess.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_sess.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_sess.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_sess.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_sess.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_sess.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_sess.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
-ssl_sess.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_sess.o: ../include/safestack.h ../include/sha.h ../include/stack.h
-ssl_sess.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_sess.o: ssl_locl.h tls1.h
-ssl_stat.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_stat.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_stat.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_stat.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_stat.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_stat.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_stat.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_stat.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_stat.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-ssl_stat.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_stat.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-ssl_txt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-ssl_txt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-ssl_txt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-ssl_txt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-ssl_txt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-ssl_txt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_txt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-ssl_txt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_txt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-ssl_txt.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_txt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-t1_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-t1_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-t1_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
-t1_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-t1_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-t1_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-t1_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-t1_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-t1_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h
-t1_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-t1_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-t1_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-t1_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
-t1_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-t1_enc.o: ../include/evp.h ../include/hmac.h ../include/idea.h
+ssl_lib.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_lib.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_lib.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_lib.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_lib.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_lib.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_lib.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_lib.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_lib.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_lib.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ssl_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_lib.o: ssl_locl.h tls1.h
+ssl_rsa.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_rsa.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_rsa.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_rsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_rsa.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_rsa.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_rsa.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_rsa.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
+ssl_rsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_rsa.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
+ssl_rsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_rsa.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_sess.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_sess.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_sess.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_sess.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_sess.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_sess.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_sess.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_sess.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+ssl_sess.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssl_sess.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+ssl_sess.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_sess.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_stat.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_stat.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_stat.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_stat.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_stat.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_stat.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_stat.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_stat.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_stat.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_stat.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ssl_stat.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_stat.o: ssl_locl.h tls1.h
+ssl_txt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+ssl_txt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+ssl_txt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+ssl_txt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+ssl_txt.o: ../include/err.h ../include/evp.h ../include/idea.h
+ssl_txt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+ssl_txt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_txt.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_txt.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_txt.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+ssl_txt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_txt.o: ssl_locl.h tls1.h
+t1_clnt.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+t1_clnt.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+t1_clnt.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+t1_clnt.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+t1_clnt.o: ../include/err.h ../include/evp.h ../include/idea.h
+t1_clnt.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+t1_clnt.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+t1_clnt.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+t1_clnt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+t1_clnt.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+t1_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+t1_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+t1_enc.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+t1_enc.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+t1_enc.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+t1_enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+t1_enc.o: ../include/err.h ../include/evp.h ../include/hmac.h ../include/idea.h
 t1_enc.o: ../include/lhash.h ../include/md2.h ../include/md5.h
 t1_enc.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
 t1_enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 t1_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 t1_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h
 t1_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-t1_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-t1_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-t1_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
-t1_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-t1_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-t1_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-t1_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_lib.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+t1_lib.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+t1_lib.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+t1_lib.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+t1_lib.o: ../include/err.h ../include/evp.h ../include/idea.h
+t1_lib.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+t1_lib.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+t1_lib.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 t1_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
 t1_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h
 t1_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-t1_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-t1_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-t1_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
-t1_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-t1_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-t1_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-t1_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-t1_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-t1_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h
-t1_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-t1_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
-t1_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
-t1_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
-t1_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
-t1_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
-t1_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
-t1_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-t1_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h
-t1_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h
-t1_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+t1_meth.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+t1_meth.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+t1_meth.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+t1_meth.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+t1_meth.o: ../include/err.h ../include/evp.h ../include/idea.h
+t1_meth.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+t1_meth.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+t1_meth.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+t1_meth.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+t1_meth.o: ../include/safestack.h ../include/sha.h ../include/stack.h
+t1_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+t1_meth.o: ssl_locl.h tls1.h
+t1_srvr.o: ../crypto/opensslconf.h ../include/asn1.h ../include/bio.h
+t1_srvr.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
+t1_srvr.o: ../include/cast.h ../include/comp.h ../include/crypto.h
+t1_srvr.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
+t1_srvr.o: ../include/err.h ../include/evp.h ../include/idea.h
+t1_srvr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
+t1_srvr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+t1_srvr.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+t1_srvr.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+t1_srvr.o: ../include/rsa.h ../include/safestack.h ../include/sha.h
+t1_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+t1_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index 4d58558522..c4064726fb 100644
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -63,8 +63,8 @@
 #ifndef NOPROTO
 static int ssl23_num_ciphers(void );
 static SSL_CIPHER *ssl23_get_cipher(unsigned int u);
-static int ssl23_read(SSL *s, char *buf, int len);
-static int ssl23_write(SSL *s, const char *buf, int len);
+static int ssl23_read(SSL *s, void *buf, int len);
+static int ssl23_write(SSL *s, const void *buf, int len);
 static long ssl23_default_timeout(void );
 static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
 static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
@@ -163,7 +163,7 @@ static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
 	return(3);
 	}
 
-static int ssl23_read(SSL *s, char *buf, int len)
+static int ssl23_read(SSL *s, void *buf, int len)
 	{
 	int n;
 
@@ -193,7 +193,7 @@ static int ssl23_read(SSL *s, char *buf, int len)
 		}
 	}
 
-static int ssl23_write(SSL *s, const char *buf, int len)
+static int ssl23_write(SSL *s, const void *buf, int len)
 	{
 	int n;
 
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 4c734c9acf..b05808700a 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -393,7 +393,7 @@ void ssl2_return_error(SSL *s, int err)
 
 void ssl2_write_error(SSL *s)
 	{
-	char buf[3];
+	unsigned char buf[3];
 	int i,error;
 
 	buf[0]=SSL2_MT_ERROR;
diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index 61b20305c1..b27f81f4de 100644
--- a/ssl/s2_pkt.c
+++ b/ssl/s2_pkt.c
@@ -70,8 +70,8 @@
 
 #ifndef NOPROTO
 static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend);
-static int do_ssl_write(SSL *s, const char *buf, unsigned int len);
-static int write_pending(SSL *s, const char *buf, unsigned int len);
+static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len);
+static int write_pending(SSL *s, const unsigned char *buf, unsigned int len);
 static int ssl_mt_error(int n);
 #else
 static int read_n();
@@ -96,7 +96,7 @@ int ssl2_peek(SSL *s, char *buf, int len)
 /* SSL_read -
  * This routine will return 0 to len bytes, decrypted etc if required.
  */
-int ssl2_read(SSL *s, char *buf, int len)
+int ssl2_read(SSL *s, void *buf, int len)
 	{
 	int n;
 	unsigned char mac[MAX_MAC_SIZE];
@@ -366,8 +366,9 @@ static int read_n(SSL *s, unsigned int n, unsigned int max,
 	return(n);
 	}
 
-int ssl2_write(SSL *s, const char *buf, int len)
+int ssl2_write(SSL *s, const void *_buf, int len)
 	{
+	const unsigned char *buf=_buf;
 	unsigned int n,tot;
 	int i;
 
@@ -412,7 +413,7 @@ int ssl2_write(SSL *s, const char *buf, int len)
 		}
 	}
 
-static int write_pending(SSL *s, const char *buf, unsigned int len)
+static int write_pending(SSL *s, const unsigned char *buf, unsigned int len)
 	{
 	int i;
 
@@ -457,7 +458,7 @@ static int write_pending(SSL *s, const char *buf, unsigned int len)
 		}
 	}
 
-static int do_ssl_write(SSL *s, const char *buf, unsigned int len)
+static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)
 	{
 	unsigned int j,k,olen,p,mac_size,bs;
 	register unsigned char *pp;
@@ -612,8 +613,7 @@ int ssl2_do_write(SSL *s)
 	{
 	int ret;
 
-	ret=ssl2_write(s,(char *)&(s->init_buf->data[s->init_off]),
-		s->init_num);
+	ret=ssl2_write(s,&s->init_buf->data[s->init_off],s->init_num);
 	if (ret == s->init_num)
 		return(1);
 	if (ret < 0)
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index d5f8c464ba..f4478a9155 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -284,9 +284,8 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 
 	if (s->state == st1)
 		{
-		i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,
-			(char *)&(p[s->init_num]),
-			4-s->init_num);
+		i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
+				  4-s->init_num);
 		if (i < (4-s->init_num))
 			{
 			*ok=0;
@@ -324,8 +323,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 	n=s->s3->tmp.message_size;
 	if (n > 0)
 		{
-		i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,
-			(char *)&(p[s->init_num]),(int)n);
+		i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],n);
 		if (i != (int)n)
 			{
 			*ok=0;
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 12f7ec60b6..aefb38bbe8 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -992,7 +992,7 @@ int ssl3_shutdown(SSL *s)
 		return(0);
 	}
 
-int ssl3_write(SSL *s, const char *buf, int len)
+int ssl3_write(SSL *s, const void *buf, int len)
 	{
 	int ret,n;
 
@@ -1045,7 +1045,7 @@ int ssl3_write(SSL *s, const char *buf, int len)
 	return(ret);
 	}
 
-int ssl3_read(SSL *s, char *buf, int len)
+int ssl3_read(SSL *s, void *buf, int len)
 	{
 	int ret;
 	
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 6e581e1ab1..468831ae86 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -94,8 +94,9 @@
  */
 
 #ifndef NOPROTO
-static int do_ssl3_write(SSL *s, int type, const char *buf, unsigned int len);
-static int ssl3_write_pending(SSL *s, int type, const char *buf,
+static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
+			 unsigned int len);
+static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
 			      unsigned int len);
 static int ssl3_get_record(SSL *s);
 static int do_compress(SSL *ssl);
@@ -468,8 +469,9 @@ static int do_compress(SSL *ssl)
 /* Call this to write data
  * It will return <= 0 if not all data has been sent or non-blocking IO.
  */
-int ssl3_write_bytes(SSL *s, int type, const char *buf, int len)
+int ssl3_write_bytes(SSL *s, int type, const void *_buf, int len)
 	{
+	const unsigned char *buf=_buf;
 	unsigned int tot,n,nw;
 	int i;
 
@@ -513,8 +515,8 @@ int ssl3_write_bytes(SSL *s, int type, const char *buf, int len)
 		}
 	}
 
-static int do_ssl3_write(SSL *s, int type, const char *buf,
-	     unsigned int len)
+static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
+			 unsigned int len)
 	{
 	unsigned char *p,*plen;
 	int i,mac_size,clear=0;
@@ -628,8 +630,8 @@ err:
 	}
 
 /* if s->s3->wbuf.left != 0, we need to call this */
-static int ssl3_write_pending(SSL *s, int type, const char *buf,
-	     unsigned int len)
+static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
+			      unsigned int len)
 	{
 	int i;
 
@@ -669,7 +671,7 @@ static int ssl3_write_pending(SSL *s, int type, const char *buf,
 		}
 	}
 
-int ssl3_read_bytes(SSL *s, int type, char *buf, int len)
+int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
 	{
 	int al,i,j,n,ret;
 	SSL3_RECORD *rr;
@@ -1009,8 +1011,8 @@ int ssl3_do_write(SSL *s, int type)
 	{
 	int ret;
 
-	ret=ssl3_write_bytes(s,type,(char *)
-		&(s->init_buf->data[s->init_off]),s->init_num);
+	ret=ssl3_write_bytes(s,type,&s->init_buf->data[s->init_off],
+			     s->init_num);
 	if (ret == s->init_num)
 		return(1);
 	if (ret < 0) return(-1);
@@ -1043,7 +1045,7 @@ int ssl3_dispatch_alert(SSL *s)
 	void (*cb)()=NULL;
 
 	s->s3->alert_dispatch=0;
-	i=do_ssl3_write(s,SSL3_RT_ALERT,&(s->s3->send_alert[0]),2);
+	i=do_ssl3_write(s,SSL3_RT_ALERT,&s->s3->send_alert[0],2);
 	if (i <= 0)
 		{
 		s->s3->alert_dispatch=1;
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 4329d29ef0..9605e343dd 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -183,9 +183,9 @@ typedef struct ssl_method_st
 	void (*ssl_free)(SSL *s);
 	int (*ssl_accept)(SSL *s);
 	int (*ssl_connect)(SSL *s);
-	int (*ssl_read)(SSL *s,char *buf,int len);
+	int (*ssl_read)(SSL *s,void *buf,int len);
 	int (*ssl_peek)(SSL *s,char *buf,int len);
-	int (*ssl_write)(SSL *s,const char *buf,int len);
+	int (*ssl_write)(SSL *s,const void *buf,int len);
 	int (*ssl_shutdown)(SSL *s);
 	int (*ssl_renegotiate)(SSL *s);
 	int (*ssl_renegotiate_check)(SSL *s);
diff --git a/ssl/ssl2.h b/ssl/ssl2.h
index 4d75e93740..d7f24ac1b4 100644
--- a/ssl/ssl2.h
+++ b/ssl/ssl2.h
@@ -162,7 +162,7 @@ typedef struct ssl2_ctx_st
 	 * args were passwd */
 	unsigned int wnum;	/* number of bytes sent so far */
 	int wpend_tot;
-	const char *wpend_buf;
+	const unsigned char *wpend_buf;
 
 	int wpend_off;	/* offset to data to write */
 	int wpend_len; 	/* number of bytes passwd to write */
diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index cf34e978f1..2e2ee98929 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -286,7 +286,7 @@ typedef struct ssl3_ctx_st
 	int wpend_tot;		/* number bytes written */
 	int wpend_type;
 	int wpend_ret;		/* number of bytes submitted */
-	const char *wpend_buf;
+	const unsigned char *wpend_buf;
 
 	/* used during startup, digest all incoming/outgoing packets */
 	EVP_MD_CTX finish_dgst1;
@@ -301,7 +301,7 @@ typedef struct ssl3_ctx_st
 	/* we alow one fatal and one warning alert to be outstanding,
 	 * send close alert via the warning alert */
 	int alert_dispatch;
-	char send_alert[2];
+	unsigned char send_alert[2];
 
 	/* This flag is set when we should renegotiate ASAP, basically when
 	 * there is no more data in the read or write buffers */
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index b5f25588fd..be0c814ed5 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -396,9 +396,9 @@ int	ssl2_new(SSL *s);
 void	ssl2_free(SSL *s);
 int	ssl2_accept(SSL *s);
 int	ssl2_connect(SSL *s);
-int	ssl2_read(SSL *s, char *buf, int len);
+int	ssl2_read(SSL *s, void *buf, int len);
 int	ssl2_peek(SSL *s, char *buf, int len);
-int	ssl2_write(SSL *s, const char *buf, int len);
+int	ssl2_write(SSL *s, const void *buf, int len);
 int	ssl2_shutdown(SSL *s);
 void	ssl2_clear(SSL *s);
 long	ssl2_ctrl(SSL *s,int cmd, long larg, char *parg);
@@ -426,9 +426,9 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u);
 int ssl3_renegotiate(SSL *ssl); 
 int ssl3_renegotiate_check(SSL *ssl); 
 int ssl3_dispatch_alert(SSL *s);
-int ssl3_read_bytes(SSL *s, int type, char *buf, int len);
+int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len);
 int ssl3_part_read(SSL *s, int i);
-int ssl3_write_bytes(SSL *s, int type, const char *buf, int len);
+int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1,EVP_MD_CTX *ctx2,
 	unsigned char *sender, int slen,unsigned char *p);
 int ssl3_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p);
@@ -443,9 +443,9 @@ int	ssl3_new(SSL *s);
 void	ssl3_free(SSL *s);
 int	ssl3_accept(SSL *s);
 int	ssl3_connect(SSL *s);
-int	ssl3_read(SSL *s, char *buf, int len);
+int	ssl3_read(SSL *s, void *buf, int len);
 int	ssl3_peek(SSL *s,char *buf, int len);
-int	ssl3_write(SSL *s, const char *buf, int len);
+int	ssl3_write(SSL *s, const void *buf, int len);
 int	ssl3_shutdown(SSL *s);
 void	ssl3_clear(SSL *s);
 long	ssl3_ctrl(SSL *s,int cmd, long larg, char *parg);
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index daa15d0a30..99af1966e6 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -62,9 +62,9 @@
 #include "hmac.h"
 #include "ssl_locl.h"
 
-static void tls1_P_hash(const EVP_MD *md, unsigned char *sec, int sec_len,
-			unsigned char *seed, int seed_len, unsigned char *out,
-			int olen)
+static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
+			int sec_len, unsigned char *seed, int seed_len,
+			unsigned char *out, int olen)
 	{
 	int chunk,n;
 	unsigned int j;
@@ -107,12 +107,12 @@ static void tls1_P_hash(const EVP_MD *md, unsigned char *sec, int sec_len,
 	}
 
 static void tls1_PRF(const EVP_MD *md5, const EVP_MD *sha1,
-		     unsigned char *label, int label_len, unsigned char *sec,
-		     int slen, unsigned char *out1, unsigned char *out2,
-		     int olen)
+		     unsigned char *label, int label_len,
+		     const unsigned char *sec, int slen, unsigned char *out1,
+		     unsigned char *out2, int olen)
 	{
 	int len,i;
-	unsigned char *S1,*S2;
+	const unsigned char *S1,*S2;
 
 	len=slen/2;
 	S1=sec;
@@ -150,6 +150,7 @@ static void tls1_generate_key_block(SSL *s, unsigned char *km,
 
 int tls1_change_cipher_state(SSL *s, int which)
 	{
+	static const unsigned char empty[]="";
 	unsigned char *p,*key_block,*mac_secret;
 	unsigned char *exp_label,buf[TLS_MD_MAX_CONST_SIZE+
 		SSL3_RANDOM_SIZE*2];
@@ -296,8 +297,8 @@ printf("which = %04X\nmac key=",which);
 			p+=SSL3_RANDOM_SIZE;
 			memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
 			p+=SSL3_RANDOM_SIZE;
-			tls1_PRF(s->ctx->md5,s->ctx->sha1,
-				buf,(int)(p-buf),"",0,iv1,iv2,k*2);
+			tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,p-buf,empty,0,
+				 iv1,iv2,k*2);
 			if (client_write)
 				iv=iv1;
 			else