Fix security hole.

62 files changed, 383 insertions, 336 deletions

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 66606f5762..70194b4c33 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -39,7 +39,7 @@ LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o
 
 SRC= $(LIBSRC)
 
-EXHEADER= crypto.h cryptall.h tmdiff.h
+EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h
 HEADER=	cryptlib.h date.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -158,15 +158,18 @@ errgen:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-cpt_err.o: ../include/err.h ../include/stack.h crypto.h
+cpt_err.o: ../include/err.h ../include/stack.h crypto.h opensslv.h
 cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
 cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+cryptlib.o: opensslv.h
 cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
 cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+cversion.o: opensslv.h
 ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
 ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h
-ex_data.o: crypto.h
+ex_data.o: crypto.h opensslv.h
 mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h
-mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h
+mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h opensslv.h
 tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
-tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h tmdiff.h
+tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h opensslv.h
+tmdiff.o: tmdiff.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 59f3b86cfb..1b3f69f42e 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -122,13 +122,13 @@ $(ERRC).c: $(ERR).err
 
 a_bitstr.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bitstr.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bitstr.o: ../cryptlib.h ../crypto.h asn1.h
+a_bitstr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_bmp.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bmp.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bmp.o: ../cryptlib.h ../crypto.h asn1.h
+a_bmp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_bool.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bool.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bool.o: ../cryptlib.h ../crypto.h asn1.h
+a_bool.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_bytes.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_bytes.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_bytes.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -138,7 +138,7 @@ a_bytes.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_bytes.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_bytes.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_bytes.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_bytes.o: ../crypto.h asn1.h asn1_mac.h
+a_bytes.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_d2i_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_d2i_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_d2i_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -148,7 +148,7 @@ a_d2i_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_d2i_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_d2i_fp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_d2i_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_d2i_fp.o: ../crypto.h asn1.h asn1_mac.h
+a_d2i_fp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_digest.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_digest.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_digest.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -158,7 +158,7 @@ a_digest.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_digest.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_digest.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_digest.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_digest.o: ../crypto.h asn1.h
+a_digest.o: ../crypto.h ../opensslv.h asn1.h
 a_dup.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_dup.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_dup.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -168,13 +168,13 @@ a_dup.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_dup.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_dup.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_dup.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_dup.o: ../crypto.h asn1.h asn1_mac.h
+a_dup.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_enum.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_enum.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_enum.o: ../cryptlib.h ../crypto.h asn1.h
+a_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_gentm.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_gentm.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_gentm.o: ../cryptlib.h ../crypto.h asn1.h
+a_gentm.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_hdr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_hdr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_hdr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -184,7 +184,7 @@ a_hdr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_hdr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_hdr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_hdr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_hdr.o: ../crypto.h asn1.h asn1_mac.h
+a_hdr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_i2d_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_i2d_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_i2d_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -194,10 +194,10 @@ a_i2d_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_i2d_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_i2d_fp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_i2d_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_i2d_fp.o: ../crypto.h asn1.h asn1_mac.h
+a_i2d_fp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_int.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_int.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_int.o: ../cryptlib.h ../crypto.h asn1.h
+a_int.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_meth.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_meth.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_meth.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -207,16 +207,17 @@ a_meth.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_meth.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_meth.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_meth.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_meth.o: ../crypto.h asn1.h
+a_meth.o: ../crypto.h ../opensslv.h asn1.h
 a_object.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_object.o: ../../include/e_os.h ../../include/err.h ../../include/objects.h
-a_object.o: ../../include/stack.h ../cryptlib.h ../crypto.h asn1.h
+a_object.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+a_object.o: asn1.h
 a_octet.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_octet.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_octet.o: ../cryptlib.h ../crypto.h asn1.h
+a_octet.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_print.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_print.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_print.o: ../cryptlib.h ../crypto.h asn1.h
+a_print.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_set.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_set.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_set.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -226,7 +227,7 @@ a_set.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_set.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_set.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_set.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_set.o: ../crypto.h asn1.h asn1_mac.h
+a_set.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_sign.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_sign.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_sign.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -236,10 +237,10 @@ a_sign.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_sign.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_sign.o: ../crypto.h asn1.h
+a_sign.o: ../crypto.h ../opensslv.h asn1.h
 a_time.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_time.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_time.o: ../cryptlib.h ../crypto.h asn1.h
+a_time.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_type.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_type.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_type.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -249,10 +250,10 @@ a_type.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_type.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_type.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_type.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_type.o: ../crypto.h asn1.h asn1_mac.h
+a_type.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 a_utctm.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_utctm.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_utctm.o: ../cryptlib.h ../crypto.h asn1.h
+a_utctm.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 a_verify.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_verify.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_verify.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -262,7 +263,7 @@ a_verify.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_verify.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_verify.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 a_verify.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_verify.o: ../crypto.h asn1.h
+a_verify.o: ../crypto.h ../opensslv.h asn1.h
 asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h asn1.h
 asn1_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
@@ -273,7 +274,7 @@ asn1_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 asn1_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 asn1_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-asn1_lib.o: ../crypto.h asn1.h asn1_mac.h
+asn1_lib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 asn1_par.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_par.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 asn1_par.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -283,7 +284,7 @@ asn1_par.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_par.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 asn1_par.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 asn1_par.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-asn1_par.o: ../crypto.h asn1.h
+asn1_par.o: ../crypto.h ../opensslv.h asn1.h
 d2i_dhp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_dhp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_dhp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -293,7 +294,7 @@ d2i_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_dhp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_dhp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_dhp.o: ../crypto.h asn1.h asn1_mac.h
+d2i_dhp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -303,7 +304,7 @@ d2i_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_dsap.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_dsap.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_dsap.o: ../crypto.h asn1.h asn1_mac.h
+d2i_dsap.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -313,7 +314,7 @@ d2i_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_pr.o: ../crypto.h asn1.h
+d2i_pr.o: ../crypto.h ../opensslv.h asn1.h
 d2i_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -323,7 +324,7 @@ d2i_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_pu.o: ../crypto.h asn1.h
+d2i_pu.o: ../crypto.h ../opensslv.h asn1.h
 d2i_r_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -333,7 +334,7 @@ d2i_r_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_r_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_r_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_r_pr.o: ../crypto.h asn1.h asn1_mac.h
+d2i_r_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_r_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -343,7 +344,7 @@ d2i_r_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_r_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_r_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_r_pu.o: ../crypto.h asn1.h asn1_mac.h
+d2i_r_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_s_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -353,7 +354,7 @@ d2i_s_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_s_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_s_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_s_pr.o: ../crypto.h asn1.h asn1_mac.h
+d2i_s_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 d2i_s_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -363,7 +364,7 @@ d2i_s_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_s_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 d2i_s_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_s_pu.o: ../crypto.h asn1.h asn1_mac.h
+d2i_s_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 evp_asn1.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 evp_asn1.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 evp_asn1.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -373,7 +374,7 @@ evp_asn1.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 evp_asn1.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 evp_asn1.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 evp_asn1.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-evp_asn1.o: ../crypto.h asn1.h asn1_mac.h
+evp_asn1.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 f_enum.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_enum.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_enum.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -383,7 +384,7 @@ f_enum.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_enum.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_enum.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 f_enum.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_enum.o: ../crypto.h asn1.h
+f_enum.o: ../crypto.h ../opensslv.h asn1.h
 f_int.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_int.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_int.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -393,7 +394,7 @@ f_int.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_int.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_int.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 f_int.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_int.o: ../crypto.h asn1.h
+f_int.o: ../crypto.h ../opensslv.h asn1.h
 f_string.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_string.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_string.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -403,7 +404,7 @@ f_string.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_string.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_string.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 f_string.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_string.o: ../crypto.h asn1.h
+f_string.o: ../crypto.h ../opensslv.h asn1.h
 i2d_dhp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dhp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dhp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -413,7 +414,7 @@ i2d_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_dhp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_dhp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_dhp.o: ../crypto.h asn1.h asn1_mac.h
+i2d_dhp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -423,7 +424,7 @@ i2d_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_dsap.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_dsap.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_dsap.o: ../crypto.h asn1.h asn1_mac.h
+i2d_dsap.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -432,7 +433,7 @@ i2d_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_pr.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 i2d_pr.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 i2d_pr.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-i2d_pr.o: asn1.h
+i2d_pr.o: ../opensslv.h asn1.h
 i2d_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -441,7 +442,7 @@ i2d_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_pu.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 i2d_pu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 i2d_pu.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-i2d_pu.o: asn1.h
+i2d_pu.o: ../opensslv.h asn1.h
 i2d_r_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_r_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_r_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -451,7 +452,7 @@ i2d_r_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_r_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_r_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_r_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_r_pr.o: ../crypto.h asn1.h asn1_mac.h
+i2d_r_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_r_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_r_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_r_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -461,7 +462,7 @@ i2d_r_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_r_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_r_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_r_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_r_pu.o: ../crypto.h asn1.h asn1_mac.h
+i2d_r_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_s_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_s_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_s_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -471,7 +472,7 @@ i2d_s_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_s_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_s_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_s_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_s_pr.o: ../crypto.h asn1.h asn1_mac.h
+i2d_s_pr.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 i2d_s_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_s_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_s_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -481,7 +482,7 @@ i2d_s_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_s_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_s_pu.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 i2d_s_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-i2d_s_pu.o: ../crypto.h asn1.h asn1_mac.h
+i2d_s_pu.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 n_pkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 n_pkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 n_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -491,7 +492,7 @@ n_pkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 n_pkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 n_pkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 n_pkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-n_pkey.o: ../crypto.h asn1.h asn1_mac.h
+n_pkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 nsseq.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 nsseq.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
 nsseq.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h
@@ -500,7 +501,7 @@ nsseq.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 nsseq.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 nsseq.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 nsseq.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-nsseq.o: ../crypto.h asn1.h asn1_mac.h
+nsseq.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_dgst.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_dgst.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_dgst.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -510,7 +511,7 @@ p7_dgst.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_dgst.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_dgst.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_dgst.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_dgst.o: ../crypto.h asn1.h asn1_mac.h
+p7_dgst.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_enc.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_enc.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_enc.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -520,7 +521,7 @@ p7_enc.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_enc.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_enc.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_enc.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_enc.o: ../crypto.h asn1.h asn1_mac.h
+p7_enc.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_enc_c.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_enc_c.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_enc_c.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -530,7 +531,7 @@ p7_enc_c.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_enc_c.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_enc_c.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_enc_c.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_enc_c.o: ../crypto.h asn1.h asn1_mac.h
+p7_enc_c.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_evp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_evp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_evp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -540,7 +541,7 @@ p7_evp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_evp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_evp.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_evp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_evp.o: ../crypto.h asn1.h asn1_mac.h
+p7_evp.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_i_s.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_i_s.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_i_s.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -550,7 +551,7 @@ p7_i_s.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_i_s.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_i_s.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_i_s.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_i_s.o: ../crypto.h asn1.h asn1_mac.h
+p7_i_s.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_lib.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -560,7 +561,7 @@ p7_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_lib.o: ../crypto.h asn1.h asn1_mac.h
+p7_lib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_recip.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_recip.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_recip.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -570,7 +571,7 @@ p7_recip.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_recip.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_recip.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_recip.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_recip.o: ../crypto.h asn1.h asn1_mac.h
+p7_recip.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_s_e.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_s_e.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_s_e.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -580,7 +581,7 @@ p7_s_e.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_s_e.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_s_e.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_s_e.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_s_e.o: ../crypto.h asn1.h asn1_mac.h
+p7_s_e.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_signd.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_signd.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_signd.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -590,7 +591,7 @@ p7_signd.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_signd.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_signd.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_signd.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_signd.o: ../crypto.h asn1.h asn1_mac.h
+p7_signd.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 p7_signi.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 p7_signi.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 p7_signi.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -600,7 +601,7 @@ p7_signi.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p7_signi.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p7_signi.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p7_signi.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p7_signi.o: ../crypto.h asn1.h asn1_mac.h
+p7_signi.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 t_crl.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 t_crl.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 t_crl.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -610,11 +611,11 @@ t_crl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_crl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 t_crl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 t_crl.o: ../../include/x509.h ../../include/x509_vfy.h ../../include/x509v3.h
-t_crl.o: ../cryptlib.h ../crypto.h asn1.h
+t_crl.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 t_pkey.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 t_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
 t_pkey.o: ../../include/err.h ../../include/rsa.h ../../include/stack.h
-t_pkey.o: ../cryptlib.h ../crypto.h
+t_pkey.o: ../cryptlib.h ../crypto.h ../opensslv.h
 t_req.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 t_req.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 t_req.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -624,7 +625,7 @@ t_req.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 t_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 t_req.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-t_req.o: ../crypto.h asn1.h
+t_req.o: ../crypto.h ../opensslv.h asn1.h
 t_x509.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 t_x509.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 t_x509.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -634,7 +635,7 @@ t_x509.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 t_x509.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 t_x509.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 t_x509.o: ../../include/x509.h ../../include/x509_vfy.h ../../include/x509v3.h
-t_x509.o: ../cryptlib.h ../crypto.h asn1.h
+t_x509.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
 x_algor.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_algor.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_algor.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -644,7 +645,7 @@ x_algor.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_algor.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_algor.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_algor.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_algor.o: ../crypto.h asn1.h asn1_mac.h
+x_algor.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_attrib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_attrib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_attrib.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -654,7 +655,7 @@ x_attrib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_attrib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_attrib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_attrib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_attrib.o: ../crypto.h asn1.h asn1_mac.h
+x_attrib.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_cinf.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_cinf.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_cinf.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -664,7 +665,7 @@ x_cinf.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_cinf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_cinf.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_cinf.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_cinf.o: ../crypto.h asn1.h asn1_mac.h
+x_cinf.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_crl.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_crl.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_crl.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -674,7 +675,7 @@ x_crl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_crl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_crl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_crl.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_crl.o: ../crypto.h asn1.h asn1_mac.h
+x_crl.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_exten.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_exten.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_exten.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -684,7 +685,7 @@ x_exten.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_exten.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_exten.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_exten.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_exten.o: ../crypto.h asn1.h asn1_mac.h
+x_exten.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_info.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_info.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_info.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -694,7 +695,7 @@ x_info.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_info.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_info.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_info.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_info.o: ../crypto.h asn1.h asn1_mac.h
+x_info.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_name.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_name.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_name.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -704,7 +705,7 @@ x_name.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_name.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_name.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_name.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_name.o: ../crypto.h asn1.h asn1_mac.h
+x_name.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_pkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_pkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_pkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -714,7 +715,7 @@ x_pkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_pkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_pkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_pkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_pkey.o: ../crypto.h asn1.h asn1_mac.h
+x_pkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_pubkey.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_pubkey.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_pubkey.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -724,7 +725,7 @@ x_pubkey.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_pubkey.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_pubkey.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_pubkey.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_pubkey.o: ../crypto.h asn1.h asn1_mac.h
+x_pubkey.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_req.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_req.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_req.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -734,7 +735,7 @@ x_req.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_req.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_req.o: ../crypto.h asn1.h asn1_mac.h
+x_req.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_sig.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_sig.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_sig.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -744,7 +745,7 @@ x_sig.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_sig.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_sig.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_sig.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_sig.o: ../crypto.h asn1.h asn1_mac.h
+x_sig.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_spki.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_spki.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_spki.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -754,7 +755,7 @@ x_spki.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_spki.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_spki.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_spki.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_spki.o: ../crypto.h asn1.h asn1_mac.h
+x_spki.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_val.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_val.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_val.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -764,7 +765,7 @@ x_val.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_val.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_val.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_val.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_val.o: ../crypto.h asn1.h asn1_mac.h
+x_val.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
 x_x509.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 x_x509.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 x_x509.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -774,4 +775,4 @@ x_x509.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 x_x509.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x_x509.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 x_x509.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-x_x509.o: ../crypto.h asn1.h asn1_mac.h
+x_x509.o: ../crypto.h ../opensslv.h asn1.h asn1_mac.h
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 9c0080e3bf..5c6fdb78ff 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -69,7 +69,7 @@ static int asn1_get_length();
 static void asn1_put_length();
 #endif
 
-char *ASN1_version="ASN.1 part of OpenSSL 0.9.2 31-Dec-1998";
+char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
 
 int ASN1_check_infinite_end(p,len)
 unsigned char **p;
diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl
index d476edd747..cc4e3586df 100644
--- a/crypto/bf/Makefile.ssl
+++ b/crypto/bf/Makefile.ssl
@@ -106,7 +106,7 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 bf_cfb64.o: bf_locl.h blowfish.h
-bf_ecb.o: bf_locl.h blowfish.h
+bf_ecb.o: ../opensslv.h bf_locl.h blowfish.h
 bf_enc.o: bf_locl.h blowfish.h
 bf_ofb64.o: bf_locl.h blowfish.h
 bf_skey.o: bf_locl.h bf_pi.h blowfish.h
diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
index 0af1405c06..fd362b7cc9 100644
--- a/crypto/bf/bf_ecb.c
+++ b/crypto/bf/bf_ecb.c
@@ -58,13 +58,14 @@
 
 #include "blowfish.h"
 #include "bf_locl.h"
+#include "opensslv.h"
 
 /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
  * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
  * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
  */
 
-char *BF_version="BlowFish part of OpenSSL 0.9.2 31-Dec-1998";
+char *BF_version="BlowFish" OPENSSL_VERSION_PTEXT;
 
 char *BF_options()
 	{
diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index d3720dca03..6160a29008 100644
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -93,11 +93,11 @@ $(ERRC).c: $(ERR).err
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 b_dump.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 b_print.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 b_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bf_buff.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_buff.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_buff.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -106,7 +106,7 @@ bf_buff.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_buff.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bf_buff.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bf_buff.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bf_buff.o: bio.h
+bf_buff.o: ../opensslv.h bio.h
 bf_nbio.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_nbio.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_nbio.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -115,7 +115,7 @@ bf_nbio.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_nbio.o: ../../include/objects.h ../../include/rand.h ../../include/rc2.h
 bf_nbio.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 bf_nbio.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-bf_nbio.o: ../cryptlib.h ../crypto.h bio.h
+bf_nbio.o: ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bf_null.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
 bf_null.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 bf_null.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -124,25 +124,27 @@ bf_null.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bf_null.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bf_null.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bf_null.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bf_null.o: bio.h
+bf_null.o: ../opensslv.h bio.h
 bio_cb.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
-bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h bio.h
+bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
+bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h ../opensslv.h
+bio_err.o: bio.h
 bio_lib.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_acpt.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_conn.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_fd.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h bss_sock.c
+bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
+bss_fd.o: bss_sock.c
 bss_file.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_log.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_mem.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_null.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
 bss_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
+bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 48f4a9c466..d34cdbd4cf 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -159,56 +159,56 @@ $(ERRC).c: $(ERR).err
 
 bn_add.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_add.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_add.o: bn.h bn_lcl.h
+bn_add.o: ../opensslv.h bn.h bn_lcl.h
 bn_asm.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_asm.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_asm.o: bn.h bn_lcl.h
+bn_asm.o: ../opensslv.h bn.h bn_lcl.h
 bn_blind.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_blind.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_blind.o: bn.h bn_lcl.h
+bn_blind.o: ../opensslv.h bn.h bn_lcl.h
 bn_div.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_div.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_div.o: bn.h bn_lcl.h
+bn_div.o: ../opensslv.h bn.h bn_lcl.h
 bn_err.o: ../../include/err.h bn.h
 bn_exp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_exp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_exp.o: bn.h bn_lcl.h
+bn_exp.o: ../opensslv.h bn.h bn_lcl.h
 bn_exp2.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_exp2.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_exp2.o: bn.h bn_lcl.h
+bn_exp2.o: ../opensslv.h bn.h bn_lcl.h
 bn_gcd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_gcd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_gcd.o: bn.h bn_lcl.h
+bn_gcd.o: ../opensslv.h bn.h bn_lcl.h
 bn_lib.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_lib.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_lib.o: bn.h bn_lcl.h
+bn_lib.o: ../opensslv.h bn.h bn_lcl.h
 bn_mont.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_mont.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mont.o: bn.h bn_lcl.h
+bn_mont.o: ../opensslv.h bn.h bn_lcl.h
 bn_mpi.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_mpi.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mpi.o: bn.h bn_lcl.h
+bn_mpi.o: ../opensslv.h bn.h bn_lcl.h
 bn_mul.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_mul.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_mul.o: bn.h bn_lcl.h
+bn_mul.o: ../opensslv.h bn.h bn_lcl.h
 bn_prime.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_prime.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
-bn_prime.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h bn_prime.h
+bn_prime.o: ../cryptlib.h ../crypto.h ../opensslv.h bn.h bn_lcl.h bn_prime.h
 bn_print.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_print.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_print.o: bn.h bn_lcl.h
+bn_print.o: ../opensslv.h bn.h bn_lcl.h
 bn_rand.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_rand.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
-bn_rand.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h
+bn_rand.o: ../cryptlib.h ../crypto.h ../opensslv.h bn.h bn_lcl.h
 bn_recp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_recp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_recp.o: bn.h bn_lcl.h
+bn_recp.o: ../opensslv.h bn.h bn_lcl.h
 bn_shift.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_shift.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_shift.o: bn.h bn_lcl.h
+bn_shift.o: ../opensslv.h bn.h bn_lcl.h
 bn_sqr.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_sqr.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_sqr.o: bn.h bn_lcl.h
+bn_sqr.o: ../opensslv.h bn.h bn_lcl.h
 bn_word.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 bn_word.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bn_word.o: bn.h bn_lcl.h
+bn_word.o: ../opensslv.h bn.h bn_lcl.h
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index d8d2c3297d..994764c031 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
-char *BN_version="Big Number part of OpenSSL 0.9.2 31-Dec-1998";
+char *BN_version="Big Number" OPENSSL_VERSION_PTEXT;
 
 /* For a 32 bit machine
  * 2 -   4 ==  128
diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl
index 8a1afc3278..cbd700b435 100644
--- a/crypto/buffer/Makefile.ssl
+++ b/crypto/buffer/Makefile.ssl
@@ -86,4 +86,5 @@ $(ERRC).c: $(ERR).err
 
 buf_err.o: ../../include/err.h buffer.h
 buffer.o: ../../include/bio.h ../../include/e_os.h ../../include/err.h
-buffer.o: ../../include/stack.h ../cryptlib.h ../crypto.h buffer.h
+buffer.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+buffer.o: buffer.h
diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 3911b6c118..72ae8dec8a 100644
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -108,7 +108,7 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 c_cfb64.o: cast.h cast_lcl.h
-c_ecb.o: cast.h cast_lcl.h
+c_ecb.o: ../opensslv.h cast.h cast_lcl.h
 c_enc.o: cast.h cast_lcl.h
 c_ofb64.o: cast.h cast_lcl.h
 c_skey.o: cast.h cast_lcl.h cast_s.h
diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index 660bc691d7..e6a3d4332e 100644
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c
@@ -58,8 +58,9 @@
 
 #include "cast.h"
 #include "cast_lcl.h"
+#include "opensslv.h"
 
-char *CAST_version="CAST part of OpenSSL 0.9.2 31-Dec-1998";
+char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
 
 void CAST_ecb_encrypt(in, out, ks, encrypt)
 unsigned char *in;
diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl
index e4b8072ae5..842443a6a4 100644
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@@ -94,11 +94,11 @@ $(ERRC).c: $(ERR).err
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 c_rle.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-c_rle.o: ../../include/crypto.h ../../include/objects.h ../../include/stack.h
-c_rle.o: comp.h
+c_rle.o: ../../include/crypto.h ../../include/objects.h
+c_rle.o: ../../include/opensslv.h ../../include/stack.h comp.h
 c_zlib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-c_zlib.o: ../../include/crypto.h ../../include/objects.h ../../include/stack.h
-c_zlib.o: comp.h
+c_zlib.o: ../../include/crypto.h ../../include/objects.h
+c_zlib.o: ../../include/opensslv.h ../../include/stack.h comp.h
 comp_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 comp_lib.o: ../../include/crypto.h ../../include/objects.h
-comp_lib.o: ../../include/stack.h comp.h
+comp_lib.o: ../../include/opensslv.h ../../include/stack.h comp.h
diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index e154f0a842..dc396f0024 100644
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -87,6 +87,6 @@ $(ERRC).c: $(ERR).err
 
 conf.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 conf.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-conf.o: ../cryptlib.h ../crypto.h conf.h conf_lcl.h
+conf.o: ../cryptlib.h ../crypto.h ../opensslv.h conf.h conf_lcl.h
 conf_err.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
 conf_err.o: conf.h
diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c
index 861043c08d..e8085348e2 100644
--- a/crypto/conf/conf.c
+++ b/crypto/conf/conf.c
@@ -95,7 +95,7 @@ static CONF_VALUE *get_section();
 
 #define scan_esc(p)	((((p)[1] == '\0')?(p++):(p+=2)),p)
 
-char *CONF_version="CONF part of OpenSSL 0.9.2 31-Dec-1998";
+char *CONF_version="CONF" OPENSSL_VERSION_PTEXT;
 
 LHASH *CONF_load(h,file,line)
 LHASH *h;
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 4641604b48..990e809573 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -64,8 +64,7 @@ extern "C" {
 #endif
 
 #include "stack.h"
-
-#define OPENSSL_VERSION_NUMBER	0x0920	/* Version 0.9.1c is 0913 */
+#include "opensslv.h"
 
 /* Backward compatibility to SSLeay */
 /* This is more to be used to check the correct DLL is being used
diff --git a/crypto/cversion.c b/crypto/cversion.c
index d6e452a7de..c3a372258e 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -66,7 +66,7 @@ char *SSLeay_version(t)
 int t;
 	{
 	if (t == SSLEAY_VERSION)
-		return("OpenSSL 0.9.2 31-Dec-1998");
+		return OPENSSL_VERSION_TEXT;
 	if (t == SSLEAY_BUILT_ON)
 		{
 #ifdef DATE
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 4b021b6f26..c7b5dc4502 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -143,10 +143,14 @@ cfb64enc.o: des.h des_locl.h
 cfb_enc.o: des.h des_locl.h
 des_enc.o: des.h des_locl.h
 ecb3_enc.o: des.h des_locl.h
-ecb_enc.o: des.h des_locl.h spr.h
+ecb_enc.o: ../opensslv.h des.h des_locl.h spr.h
 ede_cbcm_enc.o: des.h des_locl.h
-enc_read.o: des.h des_locl.h
-enc_writ.o: des.h des_locl.h
+enc_read.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
+enc_read.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
+enc_read.o: ../opensslv.h des.h des_locl.h
+enc_writ.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
+enc_writ.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
+enc_writ.o: ../opensslv.h des.h des_locl.h
 fcrypt.o: des.h des.h des_locl.h des_locl.h
 fcrypt_b.o: des.h des_locl.h
 ofb64ede.o: des.h des_locl.h
@@ -158,7 +162,7 @@ rand_key.o: des.h des_locl.h
 read2pwd.o: des.h des_locl.h
 read_pwd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 read_pwd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-read_pwd.o: des.h des_locl.h
+read_pwd.o: ../opensslv.h des.h des_locl.h
 rpc_enc.o: des.h des_locl.h des_ver.h rpc_des.h
 set_key.o: des.h des_locl.h podd.h sk.h
 str2key.o: des.h des_locl.h
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index a5c2c1e77c..c6cbea3f56 100644
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -58,9 +58,10 @@
 
 #include "des_locl.h"
 #include "spr.h"
+#include "opensslv.h"
 
 char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay";
-char *DES_version="DES part of OpenSSL 0.9.2 31-Dec-1998";
+char *DES_version="DES" OPENSSL_VERSION_PTEXT;
 
 char *des_options()
 	{
diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index e5463e382c..3f94558257 100644
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -86,14 +86,14 @@ $(ERRC).c: $(ERR).err
 
 dh_check.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dh_check.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-dh_check.o: ../cryptlib.h ../crypto.h dh.h
+dh_check.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
 dh_err.o: ../../include/err.h dh.h
 dh_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dh_gen.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-dh_gen.o: ../cryptlib.h ../crypto.h dh.h
+dh_gen.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
 dh_key.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dh_key.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
-dh_key.o: ../../include/stack.h ../cryptlib.h ../crypto.h dh.h
+dh_key.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h dh.h
 dh_lib.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dh_lib.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-dh_lib.o: ../cryptlib.h ../crypto.h dh.h
+dh_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 725d994702..abee2c0e47 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -61,7 +61,7 @@
 #include "bn.h"
 #include "dh.h"
 
-char *DH_version="Diffie-Hellman part of OpenSSL 0.9.2 31-Dec-1998";
+char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 
 DH *DH_new()
 	{
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index 9888e16fdd..b1e01ab82b 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -88,18 +88,18 @@ dsa_err.o: ../../include/bn.h ../../include/err.h dsa.h
 dsa_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dsa_gen.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
 dsa_gen.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-dsa_gen.o: dsa.h
+dsa_gen.o: ../opensslv.h dsa.h
 dsa_key.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 dsa_key.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
 dsa_key.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-dsa_key.o: dsa.h
+dsa_key.o: ../opensslv.h dsa.h
 dsa_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 dsa_lib.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-dsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h dsa.h
+dsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h dsa.h
 dsa_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 dsa_sign.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
 dsa_sign.o: ../../include/rand.h ../../include/stack.h ../cryptlib.h
-dsa_sign.o: ../crypto.h dsa.h
+dsa_sign.o: ../crypto.h ../opensslv.h dsa.h
 dsa_vrf.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 dsa_vrf.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 dsa_vrf.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -109,4 +109,5 @@ dsa_vrf.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 dsa_vrf.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
 dsa_vrf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 dsa_vrf.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-dsa_vrf.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h dsa.h
+dsa_vrf.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
+dsa_vrf.o: dsa.h
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index fb91ef2a6e..c877a95951 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -64,7 +64,7 @@
 #include "dsa.h"
 #include "asn1.h"
 
-char *DSA_version="DSA part of OpenSSL 0.9.2 31-Dec-1998";
+char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 
 DSA *DSA_new()
 	{
diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl
index 8650119596..6fcc07c121 100644
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -80,7 +80,7 @@ errors:
 
 err.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 err.o: ../../include/lhash.h ../../include/stack.h ../cryptlib.h ../crypto.h
-err.o: err.h
+err.o: ../opensslv.h err.h
 err_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 err_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 err_all.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -90,7 +90,8 @@ err_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem2.h
 err_all.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 err_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 err_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-err_all.o: ../../include/x509_vfy.h ../../include/x509v3.h ../crypto.h err.h
+err_all.o: ../../include/x509_vfy.h ../../include/x509v3.h ../crypto.h
+err_all.o: ../opensslv.h err.h
 err_prn.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 err_prn.o: ../../include/lhash.h ../../include/stack.h ../cryptlib.h
-err_prn.o: ../crypto.h err.h
+err_prn.o: ../crypto.h ../opensslv.h err.h
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index 89bab2a016..89b7df56d3 100644
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -119,7 +119,7 @@ bio_b64.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bio_b64.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bio_b64.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bio_b64.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bio_b64.o: evp.h
+bio_b64.o: ../opensslv.h evp.h
 bio_enc.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 bio_enc.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 bio_enc.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -128,7 +128,7 @@ bio_enc.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bio_enc.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bio_enc.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bio_enc.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bio_enc.o: evp.h
+bio_enc.o: ../opensslv.h evp.h
 bio_md.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 bio_md.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 bio_md.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -137,7 +137,7 @@ bio_md.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bio_md.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 bio_md.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 bio_md.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-bio_md.o: evp.h
+bio_md.o: ../opensslv.h evp.h
 bio_ok.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 bio_ok.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 bio_ok.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -146,7 +146,7 @@ bio_ok.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 bio_ok.o: ../../include/objects.h ../../include/rand.h ../../include/rc2.h
 bio_ok.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 bio_ok.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-bio_ok.o: ../cryptlib.h ../crypto.h evp.h
+bio_ok.o: ../cryptlib.h ../crypto.h ../opensslv.h evp.h
 c_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 c_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 c_all.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -155,7 +155,7 @@ c_all.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 c_all.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 c_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 c_all.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-c_all.o: evp.h
+c_all.o: ../opensslv.h evp.h
 digest.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 digest.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 digest.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -164,7 +164,7 @@ digest.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 digest.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 digest.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 digest.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-digest.o: evp.h
+digest.o: ../opensslv.h evp.h
 e_cbc_3d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_3d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_3d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -173,7 +173,7 @@ e_cbc_3d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_3d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_3d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_3d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_3d.o: evp.h
+e_cbc_3d.o: ../opensslv.h evp.h
 e_cbc_bf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_bf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_bf.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -182,7 +182,7 @@ e_cbc_bf.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_bf.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_bf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_bf.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_bf.o: evp.h
+e_cbc_bf.o: ../opensslv.h evp.h
 e_cbc_c.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_c.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_c.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -191,7 +191,7 @@ e_cbc_c.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_c.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_c.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_c.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_c.o: evp.h
+e_cbc_c.o: ../opensslv.h evp.h
 e_cbc_d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -200,7 +200,7 @@ e_cbc_d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_d.o: evp.h
+e_cbc_d.o: ../opensslv.h evp.h
 e_cbc_i.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_i.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_i.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -209,7 +209,7 @@ e_cbc_i.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_i.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_i.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_i.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_i.o: evp.h
+e_cbc_i.o: ../opensslv.h evp.h
 e_cbc_r2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_r2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_r2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -218,7 +218,7 @@ e_cbc_r2.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_r2.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_r2.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_r2.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_r2.o: evp.h
+e_cbc_r2.o: ../opensslv.h evp.h
 e_cbc_r5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cbc_r5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cbc_r5.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -227,7 +227,7 @@ e_cbc_r5.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cbc_r5.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cbc_r5.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cbc_r5.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cbc_r5.o: evp.h
+e_cbc_r5.o: ../opensslv.h evp.h
 e_cfb_3d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_3d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_3d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -236,7 +236,7 @@ e_cfb_3d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_3d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_3d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_3d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_3d.o: evp.h
+e_cfb_3d.o: ../opensslv.h evp.h
 e_cfb_bf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_bf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_bf.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -245,7 +245,7 @@ e_cfb_bf.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_bf.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_bf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_bf.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_bf.o: evp.h
+e_cfb_bf.o: ../opensslv.h evp.h
 e_cfb_c.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_c.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_c.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -254,7 +254,7 @@ e_cfb_c.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_c.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_c.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_c.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_c.o: evp.h
+e_cfb_c.o: ../opensslv.h evp.h
 e_cfb_d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -263,7 +263,7 @@ e_cfb_d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_d.o: evp.h
+e_cfb_d.o: ../opensslv.h evp.h
 e_cfb_i.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_i.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_i.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -272,7 +272,7 @@ e_cfb_i.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_i.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_i.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_i.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_i.o: evp.h
+e_cfb_i.o: ../opensslv.h evp.h
 e_cfb_r2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_r2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_r2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -281,7 +281,7 @@ e_cfb_r2.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_r2.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_r2.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_r2.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_r2.o: evp.h
+e_cfb_r2.o: ../opensslv.h evp.h
 e_cfb_r5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_cfb_r5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_cfb_r5.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -290,7 +290,7 @@ e_cfb_r5.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_cfb_r5.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_cfb_r5.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_cfb_r5.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_cfb_r5.o: evp.h
+e_cfb_r5.o: ../opensslv.h evp.h
 e_ecb_3d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_3d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_3d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -299,7 +299,7 @@ e_ecb_3d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_3d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_3d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_3d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_3d.o: evp.h
+e_ecb_3d.o: ../opensslv.h evp.h
 e_ecb_bf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_bf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_bf.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -308,7 +308,7 @@ e_ecb_bf.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_bf.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_bf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_bf.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_bf.o: evp.h
+e_ecb_bf.o: ../opensslv.h evp.h
 e_ecb_c.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_c.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_c.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -317,7 +317,7 @@ e_ecb_c.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_c.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_c.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_c.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_c.o: evp.h
+e_ecb_c.o: ../opensslv.h evp.h
 e_ecb_d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -326,7 +326,7 @@ e_ecb_d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_d.o: evp.h
+e_ecb_d.o: ../opensslv.h evp.h
 e_ecb_i.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_i.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_i.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -335,7 +335,7 @@ e_ecb_i.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_i.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_i.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_i.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_i.o: evp.h
+e_ecb_i.o: ../opensslv.h evp.h
 e_ecb_r2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_r2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_r2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -344,7 +344,7 @@ e_ecb_r2.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_r2.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_r2.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_r2.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_r2.o: evp.h
+e_ecb_r2.o: ../opensslv.h evp.h
 e_ecb_r5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ecb_r5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ecb_r5.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -353,7 +353,7 @@ e_ecb_r5.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ecb_r5.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ecb_r5.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ecb_r5.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ecb_r5.o: evp.h
+e_ecb_r5.o: ../opensslv.h evp.h
 e_null.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_null.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_null.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -362,7 +362,7 @@ e_null.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_null.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_null.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_null.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_null.o: evp.h
+e_null.o: ../opensslv.h evp.h
 e_ofb_3d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_3d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_3d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -371,7 +371,7 @@ e_ofb_3d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_3d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_3d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_3d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_3d.o: evp.h
+e_ofb_3d.o: ../opensslv.h evp.h
 e_ofb_bf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_bf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_bf.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -380,7 +380,7 @@ e_ofb_bf.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_bf.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_bf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_bf.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_bf.o: evp.h
+e_ofb_bf.o: ../opensslv.h evp.h
 e_ofb_c.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_c.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_c.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -389,7 +389,7 @@ e_ofb_c.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_c.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_c.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_c.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_c.o: evp.h
+e_ofb_c.o: ../opensslv.h evp.h
 e_ofb_d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -398,7 +398,7 @@ e_ofb_d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_d.o: evp.h
+e_ofb_d.o: ../opensslv.h evp.h
 e_ofb_i.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_i.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_i.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -407,7 +407,7 @@ e_ofb_i.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_i.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_i.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_i.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_i.o: evp.h
+e_ofb_i.o: ../opensslv.h evp.h
 e_ofb_r2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_r2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_r2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -416,7 +416,7 @@ e_ofb_r2.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_r2.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_r2.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_r2.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_r2.o: evp.h
+e_ofb_r2.o: ../opensslv.h evp.h
 e_ofb_r5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_ofb_r5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_ofb_r5.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -425,7 +425,7 @@ e_ofb_r5.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_ofb_r5.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_ofb_r5.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_ofb_r5.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_ofb_r5.o: evp.h
+e_ofb_r5.o: ../opensslv.h evp.h
 e_rc4.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_rc4.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_rc4.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -434,7 +434,7 @@ e_rc4.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_rc4.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_rc4.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_rc4.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_rc4.o: evp.h
+e_rc4.o: ../opensslv.h evp.h
 e_xcbc_d.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 e_xcbc_d.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 e_xcbc_d.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -443,7 +443,7 @@ e_xcbc_d.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 e_xcbc_d.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 e_xcbc_d.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 e_xcbc_d.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-e_xcbc_d.o: evp.h
+e_xcbc_d.o: ../opensslv.h evp.h
 encode.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 encode.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 encode.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -452,7 +452,7 @@ encode.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 encode.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 encode.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 encode.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-encode.o: evp.h
+encode.o: ../opensslv.h evp.h
 evp_enc.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 evp_enc.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 evp_enc.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -461,7 +461,7 @@ evp_enc.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 evp_enc.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 evp_enc.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 evp_enc.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-evp_enc.o: evp.h
+evp_enc.o: ../opensslv.h evp.h
 evp_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 evp_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 evp_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -469,7 +469,7 @@ evp_err.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 evp_err.o: ../../include/mdc2.h ../../include/objects.h ../../include/rc2.h
 evp_err.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 evp_err.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-evp_err.o: ../crypto.h evp.h
+evp_err.o: ../crypto.h ../opensslv.h evp.h
 evp_key.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 evp_key.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 evp_key.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -479,7 +479,7 @@ evp_key.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 evp_key.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 evp_key.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 evp_key.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-evp_key.o: ../crypto.h evp.h
+evp_key.o: ../crypto.h ../opensslv.h evp.h
 evp_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 evp_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 evp_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -488,7 +488,7 @@ evp_lib.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 evp_lib.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 evp_lib.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 evp_lib.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-evp_lib.o: evp.h
+evp_lib.o: ../opensslv.h evp.h
 m_dss.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_dss.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_dss.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -498,7 +498,7 @@ m_dss.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_dss.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_dss.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_dss.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_dss.o: ../crypto.h evp.h
+m_dss.o: ../crypto.h ../opensslv.h evp.h
 m_dss1.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_dss1.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_dss1.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -508,7 +508,7 @@ m_dss1.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_dss1.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_dss1.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_dss1.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_dss1.o: ../crypto.h evp.h
+m_dss1.o: ../crypto.h ../opensslv.h evp.h
 m_md2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_md2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_md2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -518,7 +518,7 @@ m_md2.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_md2.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_md2.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_md2.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_md2.o: ../crypto.h evp.h
+m_md2.o: ../crypto.h ../opensslv.h evp.h
 m_md5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_md5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_md5.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -528,7 +528,7 @@ m_md5.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_md5.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_md5.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_md5.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_md5.o: ../crypto.h evp.h
+m_md5.o: ../crypto.h ../opensslv.h evp.h
 m_mdc2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_mdc2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_mdc2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -538,7 +538,7 @@ m_mdc2.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_mdc2.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_mdc2.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_mdc2.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_mdc2.o: ../crypto.h evp.h
+m_mdc2.o: ../crypto.h ../opensslv.h evp.h
 m_null.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_null.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_null.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -548,7 +548,7 @@ m_null.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_null.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_null.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_null.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_null.o: ../crypto.h evp.h
+m_null.o: ../crypto.h ../opensslv.h evp.h
 m_ripemd.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_ripemd.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_ripemd.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -558,7 +558,7 @@ m_ripemd.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_ripemd.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_ripemd.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_ripemd.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_ripemd.o: ../crypto.h evp.h
+m_ripemd.o: ../crypto.h ../opensslv.h evp.h
 m_sha.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_sha.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_sha.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -568,7 +568,7 @@ m_sha.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_sha.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_sha.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_sha.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_sha.o: ../crypto.h evp.h
+m_sha.o: ../crypto.h ../opensslv.h evp.h
 m_sha1.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 m_sha1.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 m_sha1.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -578,7 +578,7 @@ m_sha1.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 m_sha1.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 m_sha1.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 m_sha1.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-m_sha1.o: ../crypto.h evp.h
+m_sha1.o: ../crypto.h ../opensslv.h evp.h
 names.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 names.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 names.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -587,7 +587,7 @@ names.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 names.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 names.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 names.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-names.o: evp.h
+names.o: ../opensslv.h evp.h
 p_dec.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_dec.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_dec.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -597,7 +597,7 @@ p_dec.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rand.h
 p_dec.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p_dec.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 p_dec.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p_dec.o: ../cryptlib.h ../crypto.h evp.h
+p_dec.o: ../cryptlib.h ../crypto.h ../opensslv.h evp.h
 p_enc.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_enc.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_enc.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -607,7 +607,7 @@ p_enc.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rand.h
 p_enc.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p_enc.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 p_enc.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p_enc.o: ../cryptlib.h ../crypto.h evp.h
+p_enc.o: ../cryptlib.h ../crypto.h ../opensslv.h evp.h
 p_lib.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 p_lib.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 p_lib.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -617,7 +617,7 @@ p_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 p_lib.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p_lib.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 p_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p_lib.o: ../cryptlib.h ../crypto.h evp.h
+p_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h evp.h
 p_open.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_open.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_open.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -627,7 +627,7 @@ p_open.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p_open.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p_open.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p_open.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p_open.o: ../crypto.h evp.h
+p_open.o: ../crypto.h ../opensslv.h evp.h
 p_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_seal.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -637,7 +637,7 @@ p_seal.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rand.h
 p_seal.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p_seal.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 p_seal.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p_seal.o: ../cryptlib.h ../crypto.h evp.h
+p_seal.o: ../cryptlib.h ../crypto.h ../opensslv.h evp.h
 p_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -647,7 +647,7 @@ p_sign.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p_sign.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p_sign.o: ../crypto.h evp.h
+p_sign.o: ../crypto.h ../opensslv.h evp.h
 p_verify.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p_verify.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p_verify.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -657,4 +657,4 @@ p_verify.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 p_verify.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p_verify.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 p_verify.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p_verify.o: ../crypto.h evp.h
+p_verify.o: ../crypto.h ../opensslv.h evp.h
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 759cc1fb11..46fb3c27db 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include "evp.h"
 
-char *EVP_version="EVP part of OpenSSL 0.9.2 31-Dec-1998";
+char *EVP_version="EVP" OPENSSL_VERSION_PTEXT;
 
 void EVP_CIPHER_CTX_init(ctx)
 EVP_CIPHER_CTX *ctx;
diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl
index d3d838e891..a4aa6e14b2 100644
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@@ -83,6 +83,6 @@ hmac.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
 hmac.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
 hmac.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 hmac.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-hmac.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-hmac.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-hmac.o: ../../include/stack.h hmac.h
+hmac.o: ../../include/opensslv.h ../../include/rc2.h ../../include/rc4.h
+hmac.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+hmac.o: ../../include/sha.h ../../include/stack.h hmac.h
diff --git a/crypto/idea/Makefile.ssl b/crypto/idea/Makefile.ssl
index 5423ec8376..06199ae2a4 100644
--- a/crypto/idea/Makefile.ssl
+++ b/crypto/idea/Makefile.ssl
@@ -80,6 +80,6 @@ errors:
 
 i_cbc.o: idea.h idea_lcl.h
 i_cfb64.o: idea.h idea_lcl.h
-i_ecb.o: idea.h idea_lcl.h
+i_ecb.o: ../opensslv.h idea.h idea_lcl.h
 i_ofb64.o: idea.h idea_lcl.h
 i_skey.o: idea.h idea_lcl.h
diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
index 557e76fbc5..5682e5ad1d 100644
--- a/crypto/idea/i_ecb.c
+++ b/crypto/idea/i_ecb.c
@@ -58,8 +58,9 @@
 
 #include "idea.h"
 #include "idea_lcl.h"
+#include "opensslv.h"
 
-char *IDEA_version="IDEA part of OpenSSL 0.9.2 31-Dec-1998";
+char *IDEA_version="IDEA" OPENSSL_VERSION_PTEXT;
 
 char *idea_options()
 	{
diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile.ssl
index 3feafce886..1e83078dfe 100644
--- a/crypto/lhash/Makefile.ssl
+++ b/crypto/lhash/Makefile.ssl
@@ -80,5 +80,5 @@ errors:
 
 lh_stats.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 lh_stats.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-lh_stats.o: lhash.h
-lhash.o: ../../include/stack.h ../crypto.h lhash.h
+lh_stats.o: ../opensslv.h lhash.h
+lhash.o: ../../include/stack.h ../crypto.h ../opensslv.h lhash.h
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 73d5fdc45e..133c543c44 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -56,8 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-char *lh_version="lhash part of OpenSSL 0.9.2 31-Dec-1998";
-
 /* Code for dynamic hash table routines
  * Author - Eric Young v 2.0
  *
@@ -102,6 +100,8 @@ char *lh_version="lhash part of OpenSSL 0.9.2 31-Dec-1998";
 #include "crypto.h"
 #include "lhash.h"
 
+char *lh_version="lhash" OPENSSL_VERSION_PTEXT;
+
 #undef MIN_NODES 
 #define MIN_NODES	16
 #define UP_LOAD		(2*LH_LOAD_MULT) /* load times 256  (default 2) */
diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile.ssl
index a18f62aa01..041c2b0628 100644
--- a/crypto/md2/Makefile.ssl
+++ b/crypto/md2/Makefile.ssl
@@ -78,7 +78,7 @@ errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md2_dgst.o: md2.h
+md2_dgst.o: ../opensslv.h md2.h
 md2_one.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 md2_one.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-md2_one.o: md2.h
+md2_one.o: ../opensslv.h md2.h
diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c
index 89e62dcd19..1d5e261cdf 100644
--- a/crypto/md2/md2_dgst.c
+++ b/crypto/md2/md2_dgst.c
@@ -60,8 +60,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "md2.h"
+#include "opensslv.h"
 
-char *MD2_version="MD2 part of OpenSSL 0.9.2 31-Dec-1998";
+char *MD2_version="MD2" OPENSSL_VERSION_PTEXT;
 
 /* Implemented from RFC1319 The MD2 Message-Digest Algorithm
  */
diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile.ssl
index 898bf314fa..bf066a955f 100644
--- a/crypto/md5/Makefile.ssl
+++ b/crypto/md5/Makefile.ssl
@@ -102,5 +102,5 @@ errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md5_dgst.o: md5.h md5_locl.h
+md5_dgst.o: ../opensslv.h md5.h md5_locl.h
 md5_one.o: md5.h md5_locl.h
diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
index 78d8b9e0f6..ba33a4f476 100644
--- a/crypto/md5/md5_dgst.c
+++ b/crypto/md5/md5_dgst.c
@@ -58,8 +58,9 @@
 
 #include <stdio.h>
 #include "md5_locl.h"
+#include "opensslv.h"
 
-char *MD5_version="MD5 part of OpenSSL 0.9.2 31-Dec-1998";
+char *MD5_version="MD5" OPENSSL_VERSION_PTEXT;
 
 /* Implemented from RFC1321 The MD5 Message-Digest Algorithm
  */
diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile.ssl
index 7c4dcc6bc0..590ad18318 100644
--- a/crypto/mdc2/Makefile.ssl
+++ b/crypto/mdc2/Makefile.ssl
@@ -80,5 +80,5 @@ errors:
 
 mdc2_one.o: ../../include/bio.h ../../include/buffer.h ../../include/des.h
 mdc2_one.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-mdc2_one.o: ../cryptlib.h ../crypto.h mdc2.h
+mdc2_one.o: ../cryptlib.h ../crypto.h ../opensslv.h mdc2.h
 mdc2dgst.o: ../../include/des.h mdc2.h
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index 31e513e675..04bec6c63b 100644
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -88,16 +88,16 @@ $(ERRC).c: $(ERR).err
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 o_names.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-o_names.o: ../../include/crypto.h ../../include/lhash.h ../../include/stack.h
-o_names.o: objects.h
+o_names.o: ../../include/crypto.h ../../include/lhash.h
+o_names.o: ../../include/opensslv.h ../../include/stack.h objects.h
 obj_dat.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 obj_dat.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
-obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-obj_dat.o: ../cryptlib.h obj_dat.h objects.h
+obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
+obj_dat.o: ../../include/stack.h ../cryptlib.h obj_dat.h objects.h
 obj_err.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
-obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/stack.h
-obj_err.o: objects.h
+obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/opensslv.h
+obj_err.o: ../../include/stack.h objects.h
 obj_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 obj_lib.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
-obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-obj_lib.o: ../cryptlib.h objects.h
+obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
+obj_lib.o: ../../include/stack.h ../cryptlib.h objects.h
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
new file mode 100644
index 0000000000..16c22e923e
--- /dev/null
+++ b/crypto/opensslv.h
@@ -0,0 +1,3 @@
+#define OPENSSL_VERSION_NUMBER	0x0922	/* Version 0.9.1c is 0913 */
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.2b 22 Mar 1999"
+#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index f3d6ed68c7..e7c0a03202 100644
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -101,68 +101,71 @@ ctx_size.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
 ctx_size.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
 ctx_size.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 ctx_size.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-ctx_size.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-ctx_size.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-ctx_size.o: ../../include/stack.h
+ctx_size.o: ../../include/opensslv.h ../../include/rc2.h ../../include/rc4.h
+ctx_size.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+ctx_size.o: ../../include/sha.h ../../include/stack.h
 pem_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_all.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
 pem_all.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
 pem_all.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 pem_all.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-pem_all.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-pem_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-pem_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_all.o: ../../include/x509_vfy.h ../cryptlib.h pem.h pem2.h
+pem_all.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rc2.h
+pem_all.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
+pem_all.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
+pem_all.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
+pem_all.o: pem2.h
 pem_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_err.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
 pem_err.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
 pem_err.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
 pem_err.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
-pem_err.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
-pem_err.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-pem_err.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-pem_err.o: ../../include/x509.h ../../include/x509_vfy.h pem.h pem2.h
+pem_err.o: ../../include/objects.h ../../include/opensslv.h
+pem_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
+pem_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+pem_err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
+pem_err.o: ../../include/x509_vfy.h pem.h pem2.h
 pem_info.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_info.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_info.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
 pem_info.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
 pem_info.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 pem_info.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-pem_info.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-pem_info.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-pem_info.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-pem_info.o: ../../include/x509_vfy.h ../cryptlib.h pem.h pem2.h
+pem_info.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rc2.h
+pem_info.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
+pem_info.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
+pem_info.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
+pem_info.o: pem2.h
 pem_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_lib.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
 pem_lib.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
 pem_lib.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 pem_lib.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-pem_lib.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
-pem_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-pem_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-pem_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
-pem_lib.o: pem2.h
+pem_lib.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
+pem_lib.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+pem_lib.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
+pem_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+pem_lib.o: ../cryptlib.h pem.h pem2.h
 pem_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_seal.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
 pem_seal.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
 pem_seal.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 pem_seal.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-pem_seal.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
-pem_seal.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-pem_seal.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-pem_seal.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
-pem_seal.o: pem2.h
+pem_seal.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
+pem_seal.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+pem_seal.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
+pem_seal.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+pem_seal.o: ../cryptlib.h pem.h pem2.h
 pem_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pem_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pem_sign.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
 pem_sign.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
 pem_sign.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 pem_sign.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-pem_sign.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
-pem_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-pem_sign.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-pem_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
-pem_sign.o: pem2.h
+pem_sign.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
+pem_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+pem_sign.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
+pem_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+pem_sign.o: ../cryptlib.h pem.h pem2.h
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index f668f7ea61..6aa7bd554f 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -68,7 +68,7 @@
 #include "des.h"
 #endif
 
-char *PEM_version="PEM part of OpenSSL 0.9.2 31-Dec-1998";
+char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
 
 #define MIN_LENGTH	4
 
diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl
index 88ad9f9ada..563c9fd3bf 100644
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -95,7 +95,7 @@ pk7_doit.o: ../../include/mdc2.h ../../include/objects.h ../../include/rand.h
 pk7_doit.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 pk7_doit.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 pk7_doit.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-pk7_doit.o: ../cryptlib.h ../crypto.h pkcs7.h
+pk7_doit.o: ../cryptlib.h ../crypto.h ../opensslv.h pkcs7.h
 pk7_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pk7_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 pk7_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -105,7 +105,7 @@ pk7_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/rc2.h
 pk7_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 pk7_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 pk7_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-pk7_lib.o: ../crypto.h pkcs7.h
+pk7_lib.o: ../crypto.h ../opensslv.h pkcs7.h
 pkcs7err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pkcs7err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 pkcs7err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -114,4 +114,4 @@ pkcs7err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 pkcs7err.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 pkcs7err.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 pkcs7err.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-pkcs7err.o: ../crypto.h pkcs7.h
+pkcs7err.o: ../crypto.h ../opensslv.h pkcs7.h
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 102eaf32be..7325f7a3d4 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -79,6 +79,6 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 md_rand.o: ../../include/e_os.h ../../include/md5.h ../../include/stack.h
-md_rand.o: ../crypto.h rand.h
+md_rand.o: ../crypto.h ../opensslv.h rand.h
 rand_lib.o: rand.h
 randfile.o: ../../include/e_os.h rand.h
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 47692cb71c..fcc87438dc 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -128,7 +128,7 @@ static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
 static unsigned char md[MD_DIGEST_LENGTH];
 static long md_count[2]={0,0};
 
-char *RAND_version="RAND part of OpenSSL 0.9.2 31-Dec-1998";
+char *RAND_version="RAND" OPENSSL_VERSION_PTEXT;
 
 static void ssleay_rand_cleanup(void);
 static void ssleay_rand_seed(const void *buf, int num);
diff --git a/crypto/rc2/Makefile.ssl b/crypto/rc2/Makefile.ssl
index b34de8a91b..9eecdfbc8f 100644
--- a/crypto/rc2/Makefile.ssl
+++ b/crypto/rc2/Makefile.ssl
@@ -79,7 +79,7 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 rc2_cbc.o: rc2.h rc2_locl.h
-rc2_ecb.o: rc2.h rc2_locl.h
+rc2_ecb.o: ../opensslv.h rc2.h rc2_locl.h
 rc2_skey.o: rc2.h rc2_locl.h
 rc2cfb64.o: rc2.h rc2_locl.h
 rc2ofb64.o: rc2.h rc2_locl.h
diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index 60a32809cd..7868a96415 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c
@@ -58,8 +58,9 @@
 
 #include "rc2.h"
 #include "rc2_locl.h"
+#include "opensslv.h"
 
-char *RC2_version="RC2 part of OpenSSL 0.9.2 31-Dec-1998";
+char *RC2_version="RC2" OPENSSL_VERSION_PTEXT;
 
 /* RC2 as implemented frm a posting from
  * Newsgroups: sci.crypt
diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile.ssl
index c1ce04590c..61c1354216 100644
--- a/crypto/rc4/Makefile.ssl
+++ b/crypto/rc4/Makefile.ssl
@@ -107,4 +107,4 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 rc4_enc.o: rc4.h rc4_locl.h
-rc4_skey.o: rc4.h rc4_locl.h
+rc4_skey.o: ../opensslv.h rc4.h rc4_locl.h
diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index c80811c430..b33a4cbfb2 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c
@@ -58,8 +58,9 @@
 
 #include "rc4.h"
 #include "rc4_locl.h"
+#include "opensslv.h"
 
-char *RC4_version="RC4 part of OpenSSL 0.9.2 31-Dec-1998";
+char *RC4_version="RC4" OPENSSL_VERSION_PTEXT;
 
 char *RC4_options()
 	{
diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl
index ca6aeca35e..c212aea8b4 100644
--- a/crypto/rc5/Makefile.ssl
+++ b/crypto/rc5/Makefile.ssl
@@ -104,7 +104,7 @@ errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rc5_ecb.o: rc5.h rc5_locl.h
+rc5_ecb.o: ../opensslv.h rc5.h rc5_locl.h
 rc5_enc.o: rc5.h rc5_locl.h
 rc5_skey.o: rc5.h rc5_locl.h
 rc5cfb64.o: rc5.h rc5_locl.h
diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index 9b43b1c8a1..5506572aef 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c
@@ -58,8 +58,9 @@
 
 #include "rc5.h"
 #include "rc5_locl.h"
+#include "opensslv.h"
 
-char *RC5_version="RC5 part of OpenSSL 0.9.2 31-Dec-1998";
+char *RC5_version="RC5" OPENSSL_VERSION_PTEXT;
 
 void RC5_32_ecb_encrypt(in, out, ks, encrypt)
 unsigned char *in;
diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl
index 926ead934e..f3304e8fc2 100644
--- a/crypto/ripemd/Makefile.ssl
+++ b/crypto/ripemd/Makefile.ssl
@@ -102,5 +102,5 @@ errors:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rmd_dgst.o: ripemd.h rmd_locl.h rmdconst.h
+rmd_dgst.o: ../opensslv.h ripemd.h rmd_locl.h rmdconst.h
 rmd_one.o: ripemd.h rmd_locl.h rmdconst.h
diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c
index 99418f58a2..0a64a87f1c 100644
--- a/crypto/ripemd/rmd_dgst.c
+++ b/crypto/ripemd/rmd_dgst.c
@@ -58,8 +58,9 @@
 
 #include <stdio.h>
 #include "rmd_locl.h"
+#include "opensslv.h"
 
-char *RMD160_version="RIPE-MD160 part of OpenSSL 0.9.2 31-Dec-1998";
+char *RMD160_version="RIPE-MD160" OPENSSL_VERSION_PTEXT;
 
 #ifndef NOPROTO
 #  ifdef RMD160_ASM
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index 19ec1dca2d..d829e96f8d 100644
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -88,25 +88,25 @@ $(ERRC).c: $(ERR).err $(ERR).h
 
 rsa_eay.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_eay.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
-rsa_eay.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
+rsa_eay.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
 rsa_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h
-rsa_err.o: ../crypto.h rsa.h
+rsa_err.o: ../crypto.h ../opensslv.h rsa.h
 rsa_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_gen.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-rsa_gen.o: ../cryptlib.h ../crypto.h rsa.h
+rsa_gen.o: ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
 rsa_lib.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_lib.o: ../../include/e_os.h ../../include/err.h ../../include/lhash.h
-rsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
+rsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
 rsa_none.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_none.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
-rsa_none.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
+rsa_none.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
 rsa_oaep.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_oaep.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
 rsa_oaep.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-rsa_oaep.o: rsa.h
+rsa_oaep.o: ../opensslv.h rsa.h
 rsa_pk1.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_pk1.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
-rsa_pk1.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
+rsa_pk1.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
 rsa_saos.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 rsa_saos.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 rsa_saos.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -116,7 +116,7 @@ rsa_saos.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 rsa_saos.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 rsa_saos.o: ../../include/ripemd.h ../../include/sha.h ../../include/stack.h
 rsa_saos.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-rsa_saos.o: ../crypto.h rsa.h
+rsa_saos.o: ../crypto.h ../opensslv.h rsa.h
 rsa_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 rsa_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 rsa_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -126,7 +126,7 @@ rsa_sign.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 rsa_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 rsa_sign.o: ../../include/ripemd.h ../../include/sha.h ../../include/stack.h
 rsa_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-rsa_sign.o: ../crypto.h rsa.h
+rsa_sign.o: ../crypto.h ../opensslv.h rsa.h
 rsa_ssl.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 rsa_ssl.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
-rsa_ssl.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
+rsa_ssl.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 27cd8ae8bf..6f9d182f9b 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -63,7 +63,7 @@
 #include "bn.h"
 #include "rsa.h"
 
-char *RSA_version="RSA part of OpenSSL 0.9.2 31-Dec-1998";
+char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
 
 static RSA_METHOD *default_RSA_meth=NULL;
 static int rsa_meth_num=0;
diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 36993d04d6..9214c583a8 100644
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -102,6 +102,6 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 sha1_one.o: sha.h
-sha1dgst.o: sha.h sha_locl.h
-sha_dgst.o: sha.h sha_locl.h
+sha1dgst.o: ../opensslv.h sha.h sha_locl.h
+sha_dgst.o: ../opensslv.h sha.h sha_locl.h
 sha_one.o: sha.h
diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 558175d216..344b3833d3 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -62,8 +62,9 @@
 #define SHA_1
 #include "sha.h"
 #include "sha_locl.h"
+#include "opensslv.h"
 
-char *SHA1_version="SHA1 part of OpenSSL 0.9.2 31-Dec-1998";
+char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
 
 /* Implemented from SHA-1 document - The Secure Hash Algorithm
  */
diff --git a/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c
index fcca22b011..15245e3b2c 100644
--- a/crypto/sha/sha_dgst.c
+++ b/crypto/sha/sha_dgst.c
@@ -62,8 +62,9 @@
 #undef SHA_1
 #include "sha.h"
 #include "sha_locl.h"
+#include "opensslv.h"
 
-char *SHA_version="SHA part of OpenSSL 0.9.2 31-Dec-1998";
+char *SHA_version="SHA" OPENSSL_VERSION_PTEXT;
 
 /* Implemented from SHA-0 document - The Secure Hash Algorithm
  */
diff --git a/crypto/stack/Makefile.ssl b/crypto/stack/Makefile.ssl
index 8d3c0aa7ac..01ad0f0984 100644
--- a/crypto/stack/Makefile.ssl
+++ b/crypto/stack/Makefile.ssl
@@ -79,4 +79,4 @@ errors:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 stack.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-stack.o: ../../include/err.h ../cryptlib.h ../crypto.h stack.h
+stack.o: ../../include/err.h ../cryptlib.h ../crypto.h ../opensslv.h stack.h
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 683468264a..9b552251f1 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -72,7 +72,7 @@
 #undef MIN_NODES
 #define MIN_NODES	4
 
-char *STACK_version="Stack part of OpenSSL 0.9.2 31-Dec-1998";
+char *STACK_version="Stack" OPENSSL_VERSION_PTEXT;
 
 #ifndef NOPROTO
 #define	FP_ICC	(int (*)(const void *,const void *))
diff --git a/crypto/txt_db/Makefile.ssl b/crypto/txt_db/Makefile.ssl
index e47a135ee8..929354b851 100644
--- a/crypto/txt_db/Makefile.ssl
+++ b/crypto/txt_db/Makefile.ssl
@@ -80,4 +80,4 @@ errors:
 
 txt_db.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
 txt_db.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-txt_db.o: ../cryptlib.h ../crypto.h txt_db.h
+txt_db.o: ../cryptlib.h ../crypto.h ../opensslv.h txt_db.h
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index 8dc01ea022..34a87e332d 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -66,7 +66,7 @@
 #undef BUFSIZE
 #define BUFSIZE	512
 
-char *TXT_DB_version="TXT_DB part of OpenSSL 0.9.2 31-Dec-1998";
+char *TXT_DB_version="TXT_DB" OPENSSL_VERSION_PTEXT;
 
 TXT_DB *TXT_DB_read(in,num)
 BIO *in;
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl
index 9f1a607630..4f61d6997b 100644
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@@ -105,7 +105,7 @@ by_dir.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 by_dir.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 by_dir.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 by_dir.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-by_dir.o: x509.h x509_vfy.h
+by_dir.o: ../opensslv.h x509.h x509_vfy.h
 by_file.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 by_file.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 by_file.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -115,7 +115,8 @@ by_file.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 by_file.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h
 by_file.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 by_file.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+by_file.o: x509_vfy.h
 v3_net.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_net.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_net.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -124,7 +125,8 @@ v3_net.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 v3_net.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_net.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_net.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-v3_net.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+v3_net.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+v3_net.o: x509_vfy.h
 v3_x509.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_x509.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_x509.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -133,7 +135,8 @@ v3_x509.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 v3_x509.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_x509.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_x509.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-v3_x509.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+v3_x509.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+v3_x509.o: x509_vfy.h
 x509_cmp.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_cmp.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_cmp.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -142,7 +145,8 @@ x509_cmp.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_cmp.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_cmp.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_cmp.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_cmp.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_cmp.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509_cmp.o: x509.h x509_vfy.h
 x509_d2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_d2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_d2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -151,7 +155,8 @@ x509_d2.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_d2.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_d2.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_d2.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_d2.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_d2.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+x509_d2.o: x509_vfy.h
 x509_def.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_def.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_def.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -160,7 +165,8 @@ x509_def.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_def.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_def.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_def.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_def.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_def.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509_def.o: x509.h x509_vfy.h
 x509_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 x509_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -168,8 +174,8 @@ x509_err.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
 x509_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 x509_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 x509_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-x509_err.o: ../../include/sha.h ../../include/stack.h ../crypto.h x509.h
-x509_err.o: x509_vfy.h
+x509_err.o: ../../include/sha.h ../../include/stack.h ../crypto.h ../opensslv.h
+x509_err.o: x509.h x509_vfy.h
 x509_ext.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_ext.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_ext.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -178,7 +184,8 @@ x509_ext.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_ext.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_ext.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_ext.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_ext.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_ext.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509_ext.o: x509.h x509_vfy.h
 x509_lu.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_lu.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_lu.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -188,7 +195,7 @@ x509_lu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 x509_lu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 x509_lu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 x509_lu.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-x509_lu.o: x509.h x509_vfy.h
+x509_lu.o: ../opensslv.h x509.h x509_vfy.h
 x509_obj.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_obj.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_obj.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -198,7 +205,7 @@ x509_obj.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 x509_obj.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 x509_obj.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 x509_obj.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-x509_obj.o: x509.h x509_vfy.h
+x509_obj.o: ../opensslv.h x509.h x509_vfy.h
 x509_r2x.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_r2x.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_r2x.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -207,7 +214,8 @@ x509_r2x.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_r2x.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_r2x.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_r2x.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_r2x.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_r2x.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509_r2x.o: x509.h x509_vfy.h
 x509_req.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_req.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_req.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -217,7 +225,7 @@ x509_req.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h
 x509_req.o: ../../include/pem2.h ../../include/pkcs7.h ../../include/rc2.h
 x509_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 x509_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-x509_req.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_req.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h
 x509_set.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_set.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_set.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -226,7 +234,8 @@ x509_set.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_set.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_set.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_set.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_set.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_set.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509_set.o: x509.h x509_vfy.h
 x509_txt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_txt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_txt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -236,7 +245,7 @@ x509_txt.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 x509_txt.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 x509_txt.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 x509_txt.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-x509_txt.o: x509.h x509_vfy.h
+x509_txt.o: ../opensslv.h x509.h x509_vfy.h
 x509_v3.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_v3.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_v3.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -245,7 +254,8 @@ x509_v3.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509_v3.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509_v3.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509_v3.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509_v3.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509_v3.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+x509_v3.o: x509_vfy.h
 x509_vfy.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509_vfy.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509_vfy.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -255,7 +265,7 @@ x509_vfy.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 x509_vfy.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 x509_vfy.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 x509_vfy.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-x509_vfy.o: x509.h x509_vfy.h
+x509_vfy.o: ../opensslv.h x509.h x509_vfy.h
 x509name.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509name.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509name.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -264,7 +274,8 @@ x509name.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509name.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509name.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509name.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509name.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509name.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509name.o: x509.h x509_vfy.h
 x509pack.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509pack.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509pack.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -273,7 +284,8 @@ x509pack.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509pack.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509pack.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509pack.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509pack.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509pack.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509pack.o: x509.h x509_vfy.h
 x509rset.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509rset.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509rset.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -282,7 +294,8 @@ x509rset.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509rset.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509rset.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509rset.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509rset.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509rset.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509rset.o: x509.h x509_vfy.h
 x509type.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x509type.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x509type.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -291,7 +304,8 @@ x509type.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x509type.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x509type.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x509type.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x509type.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x509type.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
+x509type.o: x509.h x509_vfy.h
 x_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 x_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 x_all.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -300,4 +314,5 @@ x_all.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
 x_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 x_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 x_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-x_all.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
+x_all.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
+x_all.o: x509_vfy.h
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 969c016950..6bae1386d4 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -79,7 +79,8 @@ static int null_callback();
 static int internal_verify();
 #endif
 
-char *X509_version="X.509 part of OpenSSL 0.9.2 31-Dec-1998";
+char *X509_version="X.509" OPENSSL_VERSION_PTEXT;
+
 static STACK *x509_store_ctx_method=NULL;
 static int x509_store_ctx_num=0;
 #if 0
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl
index 0f9319df20..6b5399cc0a 100644
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -98,7 +98,7 @@ v3_akey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_akey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_akey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_akey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_akey.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_akey.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_alt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_alt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_alt.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -109,7 +109,7 @@ v3_alt.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_alt.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_alt.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_alt.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_alt.o: ../crypto.h x509v3.h
+v3_alt.o: ../crypto.h ../opensslv.h x509v3.h
 v3_bcons.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 v3_bcons.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 v3_bcons.o: ../../include/cast.h ../../include/conf.h ../../include/des.h
@@ -120,7 +120,7 @@ v3_bcons.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_bcons.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_bcons.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_bcons.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_bcons.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_bcons.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_bitst.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_bitst.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_bitst.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -131,7 +131,7 @@ v3_bitst.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_bitst.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_bitst.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_bitst.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_bitst.o: ../crypto.h x509v3.h
+v3_bitst.o: ../crypto.h ../opensslv.h x509v3.h
 v3_conf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_conf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_conf.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -142,7 +142,7 @@ v3_conf.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_conf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_conf.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_conf.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_conf.o: ../crypto.h x509v3.h
+v3_conf.o: ../crypto.h ../opensslv.h x509v3.h
 v3_enum.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_enum.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_enum.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -152,7 +152,7 @@ v3_enum.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_enum.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_enum.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_enum.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_enum.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_extku.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_extku.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_extku.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -163,7 +163,7 @@ v3_extku.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_extku.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_extku.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_extku.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_extku.o: ../crypto.h x509v3.h
+v3_extku.o: ../crypto.h ../opensslv.h x509v3.h
 v3_genn.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 v3_genn.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 v3_genn.o: ../../include/cast.h ../../include/conf.h ../../include/des.h
@@ -174,7 +174,7 @@ v3_genn.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_genn.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_genn.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_genn.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_genn.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_genn.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_ia5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_ia5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_ia5.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -185,7 +185,7 @@ v3_ia5.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_ia5.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_ia5.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_ia5.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_ia5.o: ../crypto.h x509v3.h
+v3_ia5.o: ../crypto.h ../opensslv.h x509v3.h
 v3_int.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_int.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_int.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -195,7 +195,7 @@ v3_int.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_int.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_int.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_int.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_int.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_int.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_lib.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -206,7 +206,7 @@ v3_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_lib.o: ../crypto.h x509v3.h
+v3_lib.o: ../crypto.h ../opensslv.h x509v3.h
 v3_pku.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 v3_pku.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 v3_pku.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -216,7 +216,8 @@ v3_pku.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 v3_pku.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 v3_pku.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 v3_pku.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-v3_pku.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h x509v3.h
+v3_pku.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
+v3_pku.o: x509v3.h
 v3_prn.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_prn.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_prn.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -227,7 +228,7 @@ v3_prn.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_prn.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_prn.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_prn.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_prn.o: ../crypto.h x509v3.h
+v3_prn.o: ../crypto.h ../opensslv.h x509v3.h
 v3_skey.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_skey.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_skey.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -237,7 +238,7 @@ v3_skey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 v3_skey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 v3_skey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 v3_skey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-v3_skey.o: ../cryptlib.h ../crypto.h x509v3.h
+v3_skey.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
 v3_utl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3_utl.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 v3_utl.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
@@ -248,7 +249,7 @@ v3_utl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 v3_utl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 v3_utl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
 v3_utl.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-v3_utl.o: ../crypto.h x509v3.h
+v3_utl.o: ../crypto.h ../opensslv.h x509v3.h
 v3err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 v3err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 v3err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -257,4 +258,4 @@ v3err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
 v3err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 v3err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 v3err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-v3err.o: ../../include/x509_vfy.h ../crypto.h x509v3.h
+v3err.o: ../../include/x509_vfy.h ../crypto.h ../opensslv.h x509v3.h