diff --git a/CHANGES b/CHANGES
index 82b190b70098742abfe234797d4201f7da6422f4..2a006073262eb1fde6e983388cce01b2849bfeff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,16 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Make SSL_get_peer_cert_chain() work in servers. Unfortunately, it still
+     doesn't work when the session is reused. Coming soon!
+     [Ben Laurie]
+
+  *) Fix a security hole, that allows sessions to be reused in the wrong
+     context thus bypassing client cert protection! All software that uses
+     client certs and session caches in multiple contexts NEEDS PATCHING to
+     allow session reuse! A fuller solution is in the works.
+     [Ben Laurie, problem pointed out by Holger Reif, Bodo Moeller (and ???)]
+
   *) Some more source tree cleanups (removed obsolete files
      crypto/bf/asm/bf586.pl, test/test.txt and crypto/sha/asm/f.s; changed
      permission on "config" script to be executable) and a fix for the INSTALL
diff --git a/README b/README
index 71ab13395e1c3cd5bc4faaaf0a666ef3053985dc..b03836941da5665269dcebfa803f8b6c67fdc978 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.2 06-Mar-1999
+ OpenSSL 0.9.2b 22 Mar 1999
 
  Copyright (c) 1998-1999 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 8aa5c8db996ea0d4a18a662bfe609f27a94927bb..f9b16d75115efaa3ee4bc510522b9593eca52a4f 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -138,37 +138,38 @@ progs.h:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 apps.o: ../include/bio.h ../include/buffer.h ../include/crypto.h
-apps.o: ../include/e_os.h ../include/stack.h apps.h progs.h
+apps.o: ../include/e_os.h ../include/opensslv.h ../include/stack.h apps.h
+apps.o: progs.h
 asn1pars.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 asn1pars.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 asn1pars.o: ../include/crypto.h ../include/des.h ../include/dh.h
 asn1pars.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 asn1pars.o: ../include/evp.h ../include/idea.h ../include/md2.h
 asn1pars.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-asn1pars.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
-asn1pars.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-asn1pars.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-asn1pars.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-asn1pars.o: progs.h
+asn1pars.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+asn1pars.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+asn1pars.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+asn1pars.o: ../include/sha.h ../include/stack.h ../include/x509.h
+asn1pars.o: ../include/x509_vfy.h apps.h progs.h
 ca.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 ca.o: ../include/buffer.h ../include/cast.h ../include/conf.h
 ca.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 ca.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 ca.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
-ca.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-ca.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ca.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
-ca.o: ../include/txt_db.h ../include/x509.h ../include/x509_vfy.h
-ca.o: ../include/x509v3.h apps.h progs.h
+ca.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+ca.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ca.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ca.o: ../include/stack.h ../include/txt_db.h ../include/x509.h
+ca.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
 ciphers.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ciphers.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ciphers.o: ../include/crypto.h ../include/des.h ../include/dh.h
 ciphers.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h
 ciphers.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 ciphers.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-ciphers.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ciphers.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ciphers.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+ciphers.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+ciphers.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ciphers.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
 ciphers.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
 ciphers.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
 ciphers.o: progs.h
@@ -176,75 +177,77 @@ crl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 crl.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 crl.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 crl.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
-crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h
-crl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-crl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-crl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
-crl.o: ../include/x509v3.h apps.h progs.h
+crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+crl.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+crl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+crl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
+crl.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h
+crl.o: progs.h
 crl2p7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 crl2p7.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 crl2p7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 crl2p7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 crl2p7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-crl2p7.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-crl2p7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-crl2p7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-crl2p7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-crl2p7.o: progs.h
+crl2p7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+crl2p7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+crl2p7.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+crl2p7.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+crl2p7.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 dgst.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 dgst.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 dgst.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 dgst.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 dgst.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-dgst.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-dgst.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-dgst.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+dgst.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+dgst.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+dgst.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
 dgst.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
 dgst.o: progs.h
 dh.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 dh.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 dh.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 dh.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
-dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h
-dh.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-dh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-dh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+dh.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+dh.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+dh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
+dh.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 dsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 dsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 dsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 dsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
-dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h
-dsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-dsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-dsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-dsa.o: progs.h
+dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+dsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+dsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+dsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
+dsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 dsaparam.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 dsaparam.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 dsaparam.o: ../include/crypto.h ../include/des.h ../include/dh.h
 dsaparam.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 dsaparam.o: ../include/evp.h ../include/idea.h ../include/md2.h
 dsaparam.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-dsaparam.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
-dsaparam.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
-dsaparam.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-dsaparam.o: ../include/sha.h ../include/stack.h ../include/x509.h
-dsaparam.o: ../include/x509_vfy.h apps.h progs.h
+dsaparam.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+dsaparam.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+dsaparam.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+dsaparam.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+dsaparam.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 enc.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 enc.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
-enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h
-enc.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-enc.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-enc.o: progs.h
+enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+enc.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
+enc.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 errstr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 errstr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 errstr.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 errstr.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 errstr.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-errstr.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h
-errstr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+errstr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+errstr.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 errstr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 errstr.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
 errstr.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
@@ -254,39 +257,41 @@ gendh.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 gendh.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 gendh.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 gendh.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-gendh.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-gendh.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h
-gendh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-gendh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-gendh.o: progs.h
+gendh.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+gendh.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
+gendh.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+gendh.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
+gendh.o: ../include/x509_vfy.h apps.h progs.h
 gendsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 gendsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 gendsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 gendsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 gendsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-gendsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-gendsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
-gendsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-gendsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-gendsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+gendsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+gendsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
+gendsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+gendsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+gendsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+gendsa.o: progs.h
 genrsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 genrsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 genrsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 genrsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 genrsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-genrsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-genrsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
-genrsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-genrsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-genrsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+genrsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+genrsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h
+genrsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+genrsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+genrsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
+genrsa.o: progs.h
 nseq.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 nseq.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 nseq.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 nseq.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 nseq.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-nseq.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-nseq.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-nseq.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+nseq.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+nseq.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+nseq.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
 nseq.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
 nseq.o: progs.h
 openssl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
@@ -295,10 +300,10 @@ openssl.o: ../include/conf.h ../include/crypto.h ../include/des.h
 openssl.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 openssl.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 openssl.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-openssl.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-openssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-openssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-openssl.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+openssl.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+openssl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+openssl.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+openssl.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
 openssl.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
 openssl.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
 openssl.o: progs.h s_apps.h
@@ -307,9 +312,9 @@ pkcs7.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 pkcs7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 pkcs7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 pkcs7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-pkcs7.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-pkcs7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-pkcs7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+pkcs7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+pkcs7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+pkcs7.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
 pkcs7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
 pkcs7.o: progs.h
 req.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
@@ -317,126 +322,130 @@ req.o: ../include/buffer.h ../include/cast.h ../include/conf.h
 req.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 req.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 req.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
-req.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-req.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h
-req.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-req.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
-req.o: ../include/x509v3.h apps.h progs.h
+req.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+req.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h ../include/rc2.h
+req.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+req.o: ../include/sha.h ../include/stack.h ../include/x509.h
+req.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h
 rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h
 rsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h
 rsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 rsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
-rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h
-rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
-rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-rsa.o: progs.h
+rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
+rsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+rsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h
+rsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 s_cb.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_cb.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_cb.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 s_cb.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 s_cb.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h
-s_cb.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s_cb.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s_cb.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
-s_cb.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
-s_cb.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
+s_cb.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s_cb.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s_cb.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
+s_cb.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+s_cb.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+s_cb.o: progs.h s_apps.h
 s_client.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_client.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_client.o: ../include/crypto.h ../include/des.h ../include/dh.h
 s_client.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 s_client.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s_client.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s_client.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-s_client.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-s_client.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s_client.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
-s_client.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-s_client.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-s_client.o: progs.h s_apps.h
+s_client.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+s_client.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+s_client.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s_client.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
+s_client.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
+s_client.o: ../include/stack.h ../include/tls1.h ../include/x509.h
+s_client.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_server.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_server.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_server.o: ../include/crypto.h ../include/des.h ../include/dh.h
 s_server.o: ../include/dsa.h ../include/e_os.h ../include/err.h
 s_server.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s_server.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s_server.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-s_server.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-s_server.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s_server.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
-s_server.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-s_server.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-s_server.o: progs.h s_apps.h
+s_server.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+s_server.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+s_server.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s_server.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
+s_server.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
+s_server.o: ../include/stack.h ../include/tls1.h ../include/x509.h
+s_server.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_socket.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_socket.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_socket.o: ../include/crypto.h ../include/des.h ../include/dh.h
 s_socket.o: ../include/dsa.h ../include/e_os.h ../include/evp.h
 s_socket.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 s_socket.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-s_socket.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-s_socket.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-s_socket.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
-s_socket.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-s_socket.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-s_socket.o: progs.h s_apps.h
+s_socket.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+s_socket.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+s_socket.o: ../include/rsa.h ../include/sha.h ../include/ssl.h
+s_socket.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h
+s_socket.o: ../include/stack.h ../include/tls1.h ../include/x509.h
+s_socket.o: ../include/x509_vfy.h apps.h progs.h s_apps.h
 s_time.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s_time.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s_time.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 s_time.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 s_time.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-s_time.o: ../include/mdc2.h ../include/objects.h ../include/pem.h
-s_time.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
-s_time.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s_time.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
-s_time.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
-s_time.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
-s_time.o: progs.h s_apps.h
+s_time.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+s_time.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
+s_time.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s_time.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s_time.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
+s_time.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
+s_time.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h
 sess_id.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 sess_id.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 sess_id.o: ../include/crypto.h ../include/des.h ../include/dh.h
 sess_id.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h
 sess_id.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 sess_id.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-sess_id.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h
-sess_id.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-sess_id.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-sess_id.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h
-sess_id.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h
-sess_id.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
+sess_id.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h
+sess_id.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+sess_id.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+sess_id.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+sess_id.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
+sess_id.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h
+sess_id.o: progs.h
 speed.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 speed.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 speed.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 speed.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/hmac.h
 speed.o: ../include/idea.h ../include/md2.h ../include/md5.h ../include/mdc2.h
-speed.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-speed.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-speed.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h
-speed.o: ../include/x509_vfy.h ./testdsa.h ./testrsa.h apps.h progs.h
+speed.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+speed.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
+speed.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+speed.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ./testdsa.h
+speed.o: ./testrsa.h apps.h progs.h
 verify.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 verify.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 verify.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 verify.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 verify.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-verify.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-verify.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-verify.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-verify.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h
-verify.o: progs.h
+verify.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+verify.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+verify.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+verify.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+verify.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h
 version.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 version.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 version.o: ../include/crypto.h ../include/des.h ../include/dh.h
 version.o: ../include/dsa.h ../include/e_os.h ../include/evp.h
 version.o: ../include/idea.h ../include/md2.h ../include/md5.h
-version.o: ../include/mdc2.h ../include/objects.h ../include/rc2.h
-version.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-version.o: ../include/rsa.h ../include/sha.h ../include/stack.h apps.h progs.h
+version.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+version.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+version.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+version.o: ../include/stack.h apps.h progs.h
 x509.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 x509.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 x509.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h
 x509.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h
 x509.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-x509.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-x509.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
-x509.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+x509.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+x509.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+x509.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h
 x509.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
 x509.o: ../include/x509v3.h apps.h progs.h
diff --git a/apps/s_apps.h b/apps/s_apps.h
index ba320946bef496337d4323b070c93ed03cfd8599..145207f5fe525703b7da46788737aab6037acfd2 100644
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -62,7 +62,7 @@
 
 #ifndef NOPROTO
 int do_accept(int acc_sock, int *sock, char **host);
-int do_server(int port, int *ret, int (*cb) ());
+int do_server(int port, int *ret, int (*cb) (), char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #else
diff --git a/apps/s_server.c b/apps/s_server.c
index df2ff5dc31ae9f952709114d0afb23a5160c3010..7d9df46085fb9ee524b0dbfcb39a202bdef6a91e 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -76,8 +76,8 @@
 
 #ifndef NOPROTO
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);
-static int sv_body(char *hostname, int s);
-static int www_body(char *hostname, int s);
+static int sv_body(char *hostname, int s, char *context);
+static int www_body(char *hostname, int s, char *context);
 static void close_accept_socket(void );
 static void sv_usage(void);
 static int init_ssl_connection(SSL *s);
@@ -190,6 +190,7 @@ static void sv_usage()
 	BIO_printf(bio_err,"usage: s_server [args ...]\n");
 	BIO_printf(bio_err,"\n");
 	BIO_printf(bio_err," -accept arg   - port to accept on (default is %d)\n",PORT);
+	BIO_printf(bio_err," -context arg  - set session ID context\n");
 	BIO_printf(bio_err," -verify arg   - turn on peer certificate verification\n");
 	BIO_printf(bio_err," -Verify arg   - turn on peer certificate verification, must have a cert.\n");
 	BIO_printf(bio_err," -cert arg     - certificate file to use, PEM format assumed\n");
@@ -231,6 +232,7 @@ char *argv[];
 	{
 	short port=PORT;
 	char *CApath=NULL,*CAfile=NULL;
+	char *context = NULL;
 	int badop=0,bugs=0;
 	int ret=1;
 	int off=0;
@@ -292,6 +294,11 @@ char *argv[];
 			verify_depth=atoi(*(++argv));
 			BIO_printf(bio_err,"verify depth is %d, must return a certificate\n",verify_depth);
 			}
+		else if	(strcmp(*argv,"-context") == 0)
+			{
+			if (--argc < 1) goto bad;
+			context= *(++argv);
+			}
 		else if	(strcmp(*argv,"-cert") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -511,9 +518,9 @@ bad:
 
 	BIO_printf(bio_s_out,"ACCEPT\n");
 	if (www)
-		do_server(port,&accept_socket,www_body);
+		do_server(port,&accept_socket,www_body, context);
 	else
-		do_server(port,&accept_socket,sv_body);
+		do_server(port,&accept_socket,sv_body, context);
 	print_stats(bio_s_out,ctx);
 	ret=0;
 end:
@@ -553,9 +560,10 @@ SSL_CTX *ssl_ctx;
 		SSL_CTX_sess_get_cache_size(ssl_ctx));
 	}
 
-static int sv_body(hostname, s)
+static int sv_body(hostname, s, context)
 char *hostname;
 int s;
+char *context;
 	{
 	char *buf=NULL;
 	fd_set readfds;
@@ -582,8 +590,11 @@ int s;
 		}
 #endif
 
-	if (con == NULL)
+	if (con == NULL) {
 		con=(SSL *)SSL_new(ctx);
+		if(context)
+		      SSL_set_session_id_context(con, context, strlen(context));
+	}
 	SSL_clear(con);
 
 	sbio=BIO_new_socket(s,BIO_NOCLOSE);
@@ -870,9 +881,10 @@ char *file;
 	}
 #endif
 
-static int www_body(hostname, s)
+static int www_body(hostname, s, context)
 char *hostname;
 int s;
+char *context;
 	{
 	char *buf=NULL;
 	int ret=1;
@@ -905,6 +917,7 @@ int s;
 	if (!BIO_set_write_buffer_size(io,bufsize)) goto err;
 
 	if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err;
+	if(context) SSL_set_session_id_context(con, context, strlen(context));
 
 	sbio=BIO_new_socket(s,BIO_NOCLOSE);
 	if (s_nbio_test)
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 5c171c31ae70cc2fd8ab255842c3e9faa0df023d..6274acf53b6db15f623bb6b815b3c6dc00958be2 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -280,10 +280,11 @@ int port;
 		return(1);
 	}
 
-int do_server(port, ret, cb)
+int do_server(port, ret, cb, context)
 int port;
 int *ret;
 int (*cb)();
+char *context;
 	{
 	int sock;
 	char *name;
@@ -304,7 +305,7 @@ int (*cb)();
 			SHUTDOWN(accept_socket);
 			return(0);
 			}
-		i=(*cb)(name,sock);
+		i=(*cb)(name,sock, context);
 		if (name != NULL) Free(name);
 		SHUTDOWN2(sock);
 		if (i < 0)
diff --git a/apps/sess_id.c b/apps/sess_id.c
index bad6364d105a9c685945d3394b5fb2c557d3aabe..4a1860d080ec685461178fa9d1742f0c69b066c0 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -79,6 +79,7 @@ static char *sess_id_usage[]={
 " -text           - print ssl session id details\n",
 " -cert           - output certificate \n",
 " -noout          - no CRL output\n",
+" -context arg    - set the session ID context\n",
 NULL
 };
 
@@ -96,7 +97,7 @@ char **argv;
 	int ret=1,i,num,badops=0;
 	BIO *out=NULL;
 	int informat,outformat;
-	char *infile=NULL,*outfile=NULL;
+	char *infile=NULL,*outfile=NULL,*context=NULL;
 	int cert=0,noout=0,text=0;
 	char **pp;
 
@@ -140,6 +141,11 @@ char **argv;
 			cert= ++num;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout= ++num;
+		else if (strcmp(*argv,"-context") == 0)
+		    {
+		    if(--argc < 1) goto bad;
+		    context=*++argv;
+		    }
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -162,6 +168,17 @@ bad:
 	x=load_sess_id(infile,informat);
 	if (x == NULL) { goto end; }
 
+	if(context)
+	    {
+	    x->sid_ctx_length=strlen(context);
+	    if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
+		{
+		BIO_printf(bio_err,"Context too long\n");
+		goto end;
+		}
+	    memcpy(x->sid_ctx,context,x->sid_ctx_length);
+	    }
+
 #ifdef undef
 	/* just testing for memory leaks :-) */
 	{
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 66606f57622dbde44fe66cea8e933fbf0adeb63b..70194b4c333b116ed5d43ff875e96b04fa43fc35 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 59f3b86cfbb541ca7b264e0fc706aa03343da6b6..1b3f69f42e33a1b2c688397f9c6e1c04346027d9 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 9c0080e3bfd491a97154ec5306ca8bcfab471ea2..5c6fdb78ff763ddd54854b4221d574ea9bd28a29 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 d476edd74755846a6d512ea14c9fab8d446e546a..cc4e3586df558b05679ba17bed1e2a30269c3dde 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 0af1405c0690ab17a0f6e41f7b15421b1040f4da..fd362b7cc9a1412ad9e68f3374628f7d7beb9a55 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 d3720dca0304aa07128289cb4f49989dcba1bc03..6160a290081dced8d6c74893075e17e3e34b2ec2 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 48f4a9c466e2a68fd0034416f87ee2b6f71f40d1..d34cdbd4cf8253031844104f33c63bf4094ac337 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 d8d2c3297d828b198d1f215e14927908e65f9a23..994764c031d133e74d71a322373ced804ef0bd19 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 8a1afc3278e9634b621f22acf6d86f2f9d58fcbc..cbd700b435acb08bf2a4ae2b0e15f4b6cea8d15a 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 3911b6c11819ab822546c41224bb6608d105bfe3..72ae8dec8a02d1bba59f86107b87a39b8bbe831b 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 660bc691d7b946003f1956c3d2e0ff974c5c11f8..e6a3d4332e937141ad445dcf7f3fb4ee1d57adec 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 e4b8072ae5448cda60524b9d2c7281fd0ee0125f..842443a6a45edc9ef7bdd84dc5f1e98fd2adb7ec 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 e154f0a8424d36a318d4ad7ca4f23a67e0a6898e..dc396f00249ab5b8f23c4576654e67d22834f9fc 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 861043c08df2511ca913d4ff90989a48c9350a0c..e8085348e2cb47760a871996f5e1e4a701741d1b 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 4641604b48854b3f092af3b77fc382aad751ebc2..990e8095730de7f48795cfc0d606882a58b46952 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 d6e452a7de7bc4d294eb9f684c227269102e8569..c3a372258edf518fac83fd5b025bf07c6efcfad2 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 4b021b6f26ed4b2b263a8d03d96c93f43f0d82b2..c7b5dc4502f20fe592698a859197a2ccd6bda29a 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 a5c2c1e77c050bf9fed3b6033a79a3b48939c804..c6cbea3f568431d130d131c72e1569b1b57def58 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 e5463e382cde9339aa9238f0da192f18e3f0755f..3f945582577068e823ee4052eb18515c38adfc28 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 725d99470224a487ae0823643f60f0f35b0827ae..abee2c0e4731be39c2aba7a565f526e044e7c251 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 9888e16fdd52eb2409f9ca266994b6ed38697a28..b1e01ab82be96aea99aacaa3abd47bfccd3785be 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 fb91ef2a6e6cf8e9f2ce874ee0d998cfad25cf99..c877a95951d81b1d2f1583cdc15faac2c4ac9801 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 8650119596982d2094740c20926bfca246c33222..6fcc07c121906de1f9d91f938169b89433778981 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 89bab2a0168baeb0068e61d6d88d9c07f1c58bd1..89b7df56d3cdc2a3786fdf5dbaf70eeedcc62676 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 759cc1fb11f77377a2df6724e78686b706d89335..46fb3c27db4da754b61ef295c70f6fc719444ec5 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 d3d838e891c57dd62888e15ada13d356222f5839..a4aa6e14b214ef0de4db95dd033c4e02be8e86b8 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 5423ec8376430821191e33bc5db9c66caa36d706..06199ae2a48a678cfe609413035597492a2dd09b 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 557e76fbc58ae367bf3e4665def17f47f4ac2275..5682e5ad1d4142a9fb2d4eb2121fe7e0c069e7b1 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 3feafce886ba311e0611e2d063dd843686254c9c..1e83078dfe65bd1e5ed94fcbdc7e53f741e98dd9 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 73d5fdc45ea1bebc612c955d3e22d2bb1932f143..133c543c44d8df44bfef13bfbf56da74f0d8281c 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 a18f62aa01cb5f51f82951438122266cd8bf6124..041c2b06284ace8bf3caacc32c01ee8a7091a547 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 89e62dcd19a28b88bd5241d73d5984652168f2f4..1d5e261cdfe9076f1e7d2d3b366541cb125587f1 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 898bf314faae721174ff77fd25f94b06adcba522..bf066a955f4cdebacaaba519c586e51d70da9be6 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 78d8b9e0f6c9db64718dadd442d595bdd58347db..ba33a4f4764f80b17e32a2ce4cf620506f2d5713 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 7c4dcc6bc08d83bbe9d53a26feae307662b888b7..590ad18318b8e35a502382316da8bcad3357c465 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 31e513e67507e95a664dfe636be0fec000ec6006..04bec6c63b9a000338d7802f4e8034b7c538a162 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 0000000000000000000000000000000000000000..16c22e923ec85fc664fe96ae9f8ffdae62d3ee83
--- /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 f3d6ed68c7a97097050d4a2315ebc29d36b0fd53..e7c0a03202b4815ccb09d46b16011472cb49f8e9 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 f668f7ea6192a2a2d05ad9d8e04b520eabb330b0..6aa7bd554ff32fb048a0f2b0e82a3dbd79c979ea 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 88ad9f9ada265e60a9629e8058f2bfaadc185fc0..563c9fd3bf4835fd1464a1a6f134d71ffdddfdc6 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 102eaf32bee973d30aedf99a14aaf95d3c49159b..7325f7a3d4fed66e013ba940c9ec833797a3ae86 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 47692cb71c61220bb0f778d263d014065292d954..fcc87438dc04b062cfcf8ae546f50b4a721d61c1 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 b34de8a91b7a1fa4d0956c7778d13fbb6dbd6a0b..9eecdfbc8f7a5bd43848c77e1944200901ecf419 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 60a32809cdbe8a12b3516892c5445b9093e0879c..7868a964157ffb7b6be2d1e252314e5d61399d11 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 c1ce04590ca7f9443ec89dbaf81da480e2b2c626..61c135421676b3add7baa031e38c5657092cc5b2 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 c80811c430cc2a63aa72beb1426b7490fa88e569..b33a4cbfb26a3c97150ac3eff4724f4841bd03ca 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 ca6aeca35e6bd5cf1ad50ec0736f082852189fe1..c212aea8b4086e5c95074ee70bc26689120b0ff6 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 9b43b1c8a15daeca5aefeb1c937452f376682f91..5506572aef3436b67af2c27c0faa948fce54925e 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 926ead934ea95fa5d02f0b57c20356b3edb0e03a..f3304e8fc2d052f753b0c4a2d006ee074d421e36 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 99418f58a20d2f98f19bf8ec38b0d150cd6880de..0a64a87f1ca3cbaafb9add629d1fb714d64f98c6 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 19ec1dca2dddc984bafa92aca303c42f88f93f64..d829e96f8ddce20776c5b433f5915b68a7280cdf 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 27cd8ae8bff4f12cf48c6c4f0fc81ad42e0dd786..6f9d182f9b6a70bf36ab4787bfcd301e31a5eb4b 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 36993d04d6f759338a28e1c8f3a34a87b5306f8c..9214c583a8fc7de57820a171d6ed7f116f349358 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 558175d216cbb268522d21485e4409c59b280b7e..344b3833d36fc3a8343bf489c6a726629c46cc39 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 fcca22b011fc9f38548849ff360156eb4acba47c..15245e3b2c4e8465bf64349933fead6ca1ef2bb6 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 8d3c0aa7acac128230ff4c7ae4054cf855fcad19..01ad0f0984435302c81b39cbf865f3706f6a9c54 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 683468264aef42692218b0e59de06627909e746d..9b552251f15ad0793592f04e9f06e93890b4e405 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 e47a135ee86c8dda2bda9cff97e72c0d83b1b835..929354b85112608530f9e190222117810d4c46ee 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 8dc01ea0228e53cd82bd2c02cfd011c0148b5534..34a87e332d8097f9c3716d08d28eda8e2257983e 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 9f1a607630d19f61e98a131722ede71bedafc2fd..4f61d6997bb3e1d42508abb65287b8b10643e217 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 969c01695081c490cd558c42f6e9354a4a000a0e..6bae1386d45277ba9a61ef32fe9c9792533eda68 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 0f9319df20019ab03d40cbe5922fc316cde195e1..6b5399cc0a19431b607113ed5301126adfdb5b5a 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
diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl
index ccd86f37e7cee6bad3406884b43896d5a468ac1a..7b389960e602759275eeaf1d858438ca21aef7d1 100644
--- a/rsaref/Makefile.ssl
+++ b/rsaref/Makefile.ssl
@@ -85,9 +85,9 @@ $(ERRC).c: $(ERR).err
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rsar_err.o: ../crypto/crypto.h ../include/bn.h ../include/err.h
-rsar_err.o: ../include/rsa.h ../include/stack.h rsaref.h
-rsaref.o: ../crypto/cryptlib.h ../crypto/crypto.h ../include/bio.h
-rsaref.o: ../include/bn.h ../include/buffer.h ../include/e_os.h
-rsaref.o: ../include/err.h ../include/rand.h ../include/rsa.h
+rsar_err.o: ../crypto/crypto.h ../crypto/opensslv.h ../include/bn.h
+rsar_err.o: ../include/err.h ../include/rsa.h ../include/stack.h rsaref.h
+rsaref.o: ../crypto/cryptlib.h ../crypto/crypto.h ../crypto/opensslv.h
+rsaref.o: ../include/bio.h ../include/bn.h ../include/buffer.h
+rsaref.o: ../include/e_os.h ../include/err.h ../include/rand.h ../include/rsa.h
 rsaref.o: ../include/stack.h rsaref.h
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl
index ffadc17f3061b68d16905ca05d793823a37c519c..8dfa3d0a2d182d01a3a96bd3a612538c487b3ab5 100644
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -105,74 +105,74 @@ bio_ssl.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 bio_ssl.o: ../include/crypto.h ../include/des.h ../include/dh.h
 bio_ssl.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h
 bio_ssl.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-bio_ssl.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h
-bio_ssl.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-bio_ssl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-bio_ssl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-bio_ssl.o: ssl2.h ssl23.h ssl3.h tls1.h
+bio_ssl.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+bio_ssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+bio_ssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+bio_ssl.o: ../include/sha.h ../include/stack.h ../include/x509.h
+bio_ssl.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
 s23_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s23_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s23_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s23_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s23_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s23_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_clnt.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s23_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s23_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-s23_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-s23_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s23_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s23_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
+s23_clnt.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s23_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h
+s23_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s23_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s23_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s23_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s23_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s23_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s23_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_lib.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s23_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s23_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s23_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s23_lib.o: ssl_locl.h tls1.h
+s23_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s23_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s23_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s23_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s23_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s23_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s23_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s23_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s23_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s23_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s23_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_meth.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s23_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s23_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s23_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s23_meth.o: ssl_locl.h tls1.h
+s23_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s23_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s23_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s23_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s23_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s23_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s23_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s23_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s23_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s23_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s23_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_pkt.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s23_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s23_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s23_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s23_pkt.o: ssl_locl.h tls1.h
+s23_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s23_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s23_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s23_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s23_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s23_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s23_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s23_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s23_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s23_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s23_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s23_srvr.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s23_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-s23_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-s23_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-s23_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+s23_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s23_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
+s23_srvr.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+s23_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h
+s23_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s2_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s2_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s2_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_clnt.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s2_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s2_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 s2_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 s2_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -182,52 +182,52 @@ s2_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_enc.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s2_enc.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s2_enc.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s2_enc.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s2_enc.o: ssl_locl.h tls1.h
+s2_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s2_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s2_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s2_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s2_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_lib.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s2_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s2_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s2_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s2_lib.o: ssl_locl.h tls1.h
+s2_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s2_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s2_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s2_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s2_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_meth.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s2_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s2_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s2_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s2_meth.o: ssl_locl.h tls1.h
+s2_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s2_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s2_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s2_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s2_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_pkt.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s2_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s2_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s2_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s2_pkt.o: ssl_locl.h tls1.h
+s2_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s2_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s2_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s2_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s2_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s2_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s2_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s2_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s2_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s2_srvr.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s2_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s2_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s2_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s2_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 s2_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 s2_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -237,8 +237,8 @@ s3_both.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_both.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_both.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_both.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_both.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s3_both.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_both.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_both.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_both.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 s3_both.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 s3_both.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -248,8 +248,8 @@ s3_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_clnt.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s3_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 s3_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 s3_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -259,52 +259,52 @@ s3_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_enc.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s3_enc.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s3_enc.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s3_enc.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s3_enc.o: ssl_locl.h tls1.h
+s3_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s3_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s3_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s3_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s3_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_lib.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s3_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s3_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s3_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s3_lib.o: ssl_locl.h tls1.h
+s3_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s3_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s3_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s3_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s3_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_meth.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s3_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s3_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s3_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s3_meth.o: ssl_locl.h tls1.h
+s3_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s3_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s3_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s3_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s3_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_pkt.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-s3_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-s3_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-s3_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-s3_pkt.o: ssl_locl.h tls1.h
+s3_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+s3_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+s3_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 s3_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 s3_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 s3_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
 s3_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 s3_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 s3_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-s3_srvr.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-s3_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+s3_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+s3_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 s3_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 s3_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 s3_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -314,127 +314,130 @@ ssl_algs.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_algs.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_algs.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_algs.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_algs.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-ssl_algs.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_algs.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-ssl_algs.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_algs.o: ssl_locl.h tls1.h
+ssl_algs.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_algs.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_algs.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ssl_algs.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_algs.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_asn1.o: ../include/asn1.h ../include/asn1_mac.h ../include/bio.h
 ssl_asn1.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h
 ssl_asn1.o: ../include/cast.h ../include/comp.h ../include/crypto.h
 ssl_asn1.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 ssl_asn1.o: ../include/err.h ../include/evp.h ../include/idea.h
 ssl_asn1.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-ssl_asn1.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h
-ssl_asn1.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_asn1.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-ssl_asn1.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-ssl_asn1.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_asn1.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_asn1.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_asn1.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_asn1.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_asn1.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_cert.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_cert.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_cert.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_cert.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_cert.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_cert.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_cert.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-ssl_cert.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssl_cert.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_cert.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_cert.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_cert.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+ssl_cert.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+ssl_cert.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssl_cert.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+ssl_cert.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_cert.o: ssl_locl.h tls1.h
 ssl_ciph.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_ciph.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_ciph.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_ciph.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_ciph.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_ciph.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_ciph.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-ssl_ciph.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_ciph.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-ssl_ciph.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_ciph.o: ssl_locl.h tls1.h
+ssl_ciph.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_ciph.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_ciph.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ssl_ciph.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_ciph.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_err.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_err.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_err.o: ../include/crypto.h ../include/des.h ../include/dh.h
 ssl_err.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h
 ssl_err.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-ssl_err.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h
-ssl_err.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_err.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-ssl_err.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-ssl_err.o: ssl2.h ssl23.h ssl3.h tls1.h
+ssl_err.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+ssl_err.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
+ssl_err.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_err.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_err.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
 ssl_err2.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_err2.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_err2.o: ../include/crypto.h ../include/des.h ../include/dh.h
 ssl_err2.o: ../include/dsa.h ../include/err.h ../include/evp.h
 ssl_err2.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 ssl_err2.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-ssl_err2.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssl_err2.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_err2.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_err2.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
+ssl_err2.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+ssl_err2.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssl_err2.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+ssl_err2.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_err2.o: tls1.h
 ssl_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_lib.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-ssl_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-ssl_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_lib.o: ssl_locl.h tls1.h
+ssl_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ssl_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_rsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_rsa.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_rsa.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_rsa.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_rsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_rsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h
-ssl_rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssl_rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssl_rsa.o: ../include/sha.h ../include/stack.h ../include/x509.h
-ssl_rsa.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_rsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h
+ssl_rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h
+ssl_rsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssl_rsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h
+ssl_rsa.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
+ssl_rsa.o: ssl_locl.h tls1.h
 ssl_sess.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_sess.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_sess.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_sess.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_sess.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_sess.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_sess.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-ssl_sess.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-ssl_sess.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-ssl_sess.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
-ssl_sess.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+ssl_sess.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_sess.o: ../include/rand.h ../include/rc2.h ../include/rc4.h
+ssl_sess.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+ssl_sess.o: ../include/sha.h ../include/stack.h ../include/x509.h
+ssl_sess.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_stat.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_stat.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_stat.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_stat.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_stat.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_stat.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_stat.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-ssl_stat.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_stat.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-ssl_stat.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_stat.o: ssl_locl.h tls1.h
+ssl_stat.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_stat.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_stat.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ssl_stat.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_stat.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 ssl_txt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 ssl_txt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 ssl_txt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 ssl_txt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 ssl_txt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 ssl_txt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-ssl_txt.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-ssl_txt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-ssl_txt.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-ssl_txt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-ssl_txt.o: ssl_locl.h tls1.h
+ssl_txt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+ssl_txt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+ssl_txt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+ssl_txt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+ssl_txt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 t1_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 t1_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 t1_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h
 t1_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 t1_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 t1_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_clnt.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-t1_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+t1_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 t1_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 t1_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 t1_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -444,8 +447,8 @@ t1_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h
 t1_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 t1_enc.o: ../include/evp.h ../include/hmac.h ../include/idea.h
 t1_enc.o: ../include/lhash.h ../include/md2.h ../include/md5.h
-t1_enc.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h
-t1_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_enc.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h
+t1_enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 t1_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 t1_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 t1_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
@@ -455,30 +458,30 @@ t1_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h
 t1_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 t1_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 t1_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_lib.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-t1_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-t1_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-t1_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-t1_lib.o: ssl_locl.h tls1.h
+t1_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+t1_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+t1_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+t1_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 t1_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 t1_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 t1_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h
 t1_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 t1_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 t1_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_meth.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h
-t1_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-t1_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-t1_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h
-t1_meth.o: ssl_locl.h tls1.h
+t1_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+t1_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+t1_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
+t1_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 t1_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 t1_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h
 t1_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h
 t1_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h
 t1_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h
 t1_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h
-t1_srvr.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h
-t1_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+t1_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h
+t1_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h
 t1_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
 t1_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h
 t1_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index 24b884ff4c3ec926031be01906935367217cbff1..34aa0de4fd314d6770dfd19285249e11c79dbddd 100644
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -78,7 +78,7 @@ static int ssl23_put_cipher_by_char();
 static SSL_CIPHER *ssl23_get_cipher_by_char();
 #endif
 
-char *SSL23_version_str="SSLv2/3 compatibility part of OpenSSL 0.9.2 31-Dec-1998";
+char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
 
 static SSL_METHOD SSLv23_data= {
 	TLS1_VERSION,
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index df24775568c4cbff423844a8a81f7a9c73fc8df2..e7581313c96c83149f385d6493013eb232f77989 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -67,7 +67,7 @@ static long ssl2_default_timeout(void );
 static long ssl2_default_timeout();
 #endif
 
-char *ssl2_version_str="SSLv2 part of OpenSSL 0.9.2 31-Dec-1998";
+char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
 
 #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
 
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index cb63a9f7ce58d7f55b8759759dcc87c6716adacf..5cc0ff446df03f3254ff0ffeea40daad8bb26d26 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -605,9 +605,18 @@ SSL *s;
 			goto f_err;
 			}
 		}
-	if ((j != 0) && (j == s->session->session_id_length) &&
-		(memcmp(p,s->session->session_id,j) == 0))
-		s->hit=1;
+	if (j != 0 && j == s->session->session_id_length
+	    && memcmp(p,s->session->session_id,j) == 0)
+	    {
+	    if(s->sid_ctx_length != s->session->sid_ctx_length
+	       || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
+		{
+		al=SSL_AD_ILLEGAL_PARAMETER;
+		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
+		goto f_err;
+		}
+	    s->hit=1;
+	    }
 	else	/* a miss or crap from the other end */
 		{
 		/* If we were trying for session-id reuse, make a new
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 78afd87ced3fe3537ec1b69ff852e73de73c80b0..0fba6ce0ba438d0a269a3b919cf5c7f8c2efd90c 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -60,7 +60,7 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
-char *ssl3_version_str="SSLv3 part of OpenSSL 0.9.2 31-Dec-1998";
+char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
 
 #define SSL3_NUM_CIPHERS	(sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 56d8dd4737bd647b003c5a52310d4279307baa25..21b93c1ba4a6c5f3dc5394a1b14e366978fa4fd4 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1683,6 +1683,8 @@ SSL *s;
 	if (s->session->peer != NULL)
 		X509_free(s->session->peer);
 	s->session->peer=(X509 *)sk_shift(sk);
+	s->session->cert->cert_chain=sk;
+	sk=NULL;
 
 	ret=1;
 	if (0)
diff --git a/ssl/ssl.err b/ssl/ssl.err
index 413124f7f53b1a8b2138197f58dab390368a6f43..e2677d77551c78d0f26f2db1b29c7f374c6f1432 100644
--- a/ssl/ssl.err
+++ b/ssl/ssl.err
@@ -86,6 +86,7 @@
 #define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE		 179
 #define SSL_F_SSL_DO_HANDSHAKE				 180
 #define SSL_F_SSL_GET_NEW_SESSION			 181
+#define SSL_F_SSL_GET_PREV_SESSION			 217
 #define SSL_F_SSL_GET_SERVER_SEND_CERT			 182
 #define SSL_F_SSL_GET_SIGN_PKEY				 183
 #define SSL_F_SSL_INIT_WBIO_BUFFER			 184
@@ -100,6 +101,7 @@
 #define SSL_F_SSL_SET_PKEY				 193
 #define SSL_F_SSL_SET_RFD				 194
 #define SSL_F_SSL_SET_SESSION				 195
+#define SSL_F_SSL_SET_SESSION_ID_CONTEXT		 218
 #define SSL_F_SSL_SET_WFD				 196
 #define SSL_F_SSL_UNDEFINED_FUNCTION			 197
 #define SSL_F_SSL_USE_CERTIFICATE			 198
@@ -120,6 +122,7 @@
 
 /* Reason codes. */
 #define SSL_R_APP_DATA_IN_HANDSHAKE			 100
+#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
 #define SSL_R_BAD_ALERT_RECORD				 101
 #define SSL_R_BAD_AUTHENTICATION_TYPE			 102
 #define SSL_R_BAD_CHANGE_CIPHER_SPEC			 103
@@ -132,6 +135,7 @@
 #define SSL_R_BAD_DH_P_LENGTH				 110
 #define SSL_R_BAD_DIGEST_LENGTH				 111
 #define SSL_R_BAD_DSA_SIGNATURE				 112
+#define SSL_R_BAD_LENGTH				 271
 #define SSL_R_BAD_MAC_DECODE				 113
 #define SSL_R_BAD_MESSAGE_TYPE				 114
 #define SSL_R_BAD_PACKET_LENGTH				 115
@@ -262,6 +266,7 @@
 #define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION	 228
 #define SSL_R_SSL_HANDSHAKE_FAILURE			 229
 #define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS		 230
+#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG		 273
 #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT		 231
 #define SSL_R_TLSV1_ALERT_ACCESS_DENIED			 1049
 #define SSL_R_TLSV1_ALERT_DECODE_ERROR			 1050
diff --git a/ssl/ssl.h b/ssl/ssl.h
index bd9ac8f9afb6748ffde52ee5f5d4f9d09d371e9b..f0b143abd95c166738dfd1fcfaac666def426e52 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -82,6 +82,7 @@ extern "C" {
 #define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA	
 
 #define SSL_MAX_SSL_SESSION_ID_LENGTH		32
+#define SSL_MAX_SID_CTX_LENGTH			32
 
 #define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES	(512/8)
 #define SSL_MAX_KEY_ARG_LENGTH			8
@@ -208,7 +209,8 @@ typedef struct ssl_method_st
  *	Time [ 1 ] EXPLICIT	INTEGER,	-- optional Start Time
  *	Timeout [ 2 ] EXPLICIT	INTEGER,	-- optional Timeout ins seconds
  *	Peer [ 3 ] EXPLICIT	X509,		-- optional Peer Certificate
- *	Compression [4] IMPLICIT ASN1_OBJECT	-- compression OID XXXXX
+ *	Session_ID_context [ 4 ] EXPLICIT OCTET_STRING,   -- the Session ID context
+ *	Compression [5] IMPLICIT ASN1_OBJECT	-- compression OID XXXXX
  *	}
  * Look in ssl/ssl_asn1.c for more details
  * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
@@ -226,6 +228,11 @@ typedef struct ssl_session_st
 	/* session_id - valid? */
 	unsigned int session_id_length;
 	unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
+	/* this is used to determine whether the session is being reused in
+	 * the appropriate context. It is up to the application to set this,
+	 * via SSL_new */
+	unsigned int sid_ctx_length;
+	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
 
 	int not_resumable;
 
@@ -555,6 +562,11 @@ struct ssl_st
 	/* This is used to hold the server certificate used */
 	struct cert_st /* CERT */ *cert;
 
+	/* the session_id_context is used to ensure sessions are only reused
+	 * in the appropriate context */
+	unsigned int sid_ctx_length;
+	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
+
 	/* This can also be in the session once a session is established */
 	SSL_SESSION *session;
 
@@ -917,6 +929,8 @@ int SSL_CTX_check_private_key(SSL_CTX *ctx);
 int SSL_check_private_key(SSL *ctx);
 
 SSL *	SSL_new(SSL_CTX *ctx);
+int	SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
+				   unsigned int sid_ctx_len);
 void	SSL_free(SSL *ssl);
 int 	SSL_accept(SSL *ssl);
 int 	SSL_connect(SSL *ssl);
@@ -1169,6 +1183,7 @@ int SSL_CTX_check_private_key();
 int SSL_check_private_key();
 
 SSL *	SSL_new();
+int	SSL_set_session_id_context();
 void    SSL_clear();
 void	SSL_free();
 int 	SSL_accept();
@@ -1374,6 +1389,7 @@ void SSL_set_tmp_dh_callback();
 #define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE		 179
 #define SSL_F_SSL_DO_HANDSHAKE				 180
 #define SSL_F_SSL_GET_NEW_SESSION			 181
+#define SSL_F_SSL_GET_PREV_SESSION			 217
 #define SSL_F_SSL_GET_SERVER_SEND_CERT			 182
 #define SSL_F_SSL_GET_SIGN_PKEY				 183
 #define SSL_F_SSL_INIT_WBIO_BUFFER			 184
@@ -1388,6 +1404,7 @@ void SSL_set_tmp_dh_callback();
 #define SSL_F_SSL_SET_PKEY				 193
 #define SSL_F_SSL_SET_RFD				 194
 #define SSL_F_SSL_SET_SESSION				 195
+#define SSL_F_SSL_SET_SESSION_ID_CONTEXT		 218
 #define SSL_F_SSL_SET_WFD				 196
 #define SSL_F_SSL_UNDEFINED_FUNCTION			 197
 #define SSL_F_SSL_USE_CERTIFICATE			 198
@@ -1408,6 +1425,7 @@ void SSL_set_tmp_dh_callback();
 
 /* Reason codes. */
 #define SSL_R_APP_DATA_IN_HANDSHAKE			 100
+#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
 #define SSL_R_BAD_ALERT_RECORD				 101
 #define SSL_R_BAD_AUTHENTICATION_TYPE			 102
 #define SSL_R_BAD_CHANGE_CIPHER_SPEC			 103
@@ -1420,6 +1438,7 @@ void SSL_set_tmp_dh_callback();
 #define SSL_R_BAD_DH_P_LENGTH				 110
 #define SSL_R_BAD_DIGEST_LENGTH				 111
 #define SSL_R_BAD_DSA_SIGNATURE				 112
+#define SSL_R_BAD_LENGTH				 271
 #define SSL_R_BAD_MAC_DECODE				 113
 #define SSL_R_BAD_MESSAGE_TYPE				 114
 #define SSL_R_BAD_PACKET_LENGTH				 115
@@ -1550,6 +1569,7 @@ void SSL_set_tmp_dh_callback();
 #define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION	 228
 #define SSL_R_SSL_HANDSHAKE_FAILURE			 229
 #define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS		 230
+#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG		 273
 #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT		 231
 #define SSL_R_TLSV1_ALERT_ACCESS_DENIED			 1049
 #define SSL_R_TLSV1_ALERT_DECODE_ERROR			 1050
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 116a83de645e6253ed949f707edbb38be8a32ee1..f4ba04a961f303f3fc82ffe49dfbe6825a8b6d18 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -69,6 +69,7 @@ typedef struct ssl_session_asn1_st
 	ASN1_OCTET_STRING cipher;
 	ASN1_OCTET_STRING master_key;
 	ASN1_OCTET_STRING session_id;
+	ASN1_OCTET_STRING session_id_context;
 	ASN1_OCTET_STRING key_arg;
 	ASN1_INTEGER time;
 	ASN1_INTEGER timeout;
@@ -84,7 +85,7 @@ SSL_SESSION *in;
 unsigned char **pp;
 	{
 #define LSIZE2 (sizeof(long)*2)
-	int v1=0,v2=0,v3=0;
+	int v1=0,v2=0,v3=0,v4=0;
 	unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2];
 	unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2];
 	long l;
@@ -138,6 +139,10 @@ unsigned char **pp;
 	a.session_id.type=V_ASN1_OCTET_STRING;
 	a.session_id.data=in->session_id;
 
+	a.session_id_context.length=in->sid_ctx_length;
+	a.session_id_context.type=V_ASN1_OCTET_STRING;
+	a.session_id_context.data=in->sid_ctx;
+
 	a.key_arg.length=in->key_arg_length;
 	a.key_arg.type=V_ASN1_OCTET_STRING;
 	a.key_arg.data=in->key_arg;
@@ -171,6 +176,7 @@ unsigned char **pp;
 		M_ASN1_I2D_len_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
 	if (in->peer != NULL)
 		M_ASN1_I2D_len_EXP_opt(in->peer,i2d_X509,3,v3);
+	M_ASN1_I2D_len_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,v4);
 
 	M_ASN1_I2D_seq_total();
 
@@ -187,6 +193,8 @@ unsigned char **pp;
 		M_ASN1_I2D_put_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
 	if (in->peer != NULL)
 		M_ASN1_I2D_put_EXP_opt(in->peer,i2d_X509,3,v3);
+	M_ASN1_I2D_put_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,
+			       v4);
 
 	M_ASN1_I2D_finish();
 	}
@@ -308,6 +316,21 @@ long length;
 		}
 	M_ASN1_D2I_get_EXP_opt(ret->peer,d2i_X509,3);
 
+	os.length=0;
+	os.data=NULL;
+	M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,4);
+
+	if(os.data != NULL)
+	    {
+	    if (os.length > SSL_MAX_SID_CTX_LENGTH)
+		SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
+	    ret->sid_ctx_length=os.length;
+	    memcpy(ret->sid_ctx,os.data,os.length);
+	    Free(os.data); os.data=NULL; os.length=0;
+	    }
+	else
+	    ret->sid_ctx_length=0;
+
 	M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
 	}
 
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index a255a23f969775ea9b2c96de3a74cdba540d27fb..4f8bd3652a46609608e59f584f4e75b8c361d93b 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -148,6 +148,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_PACK(0,SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,0),	"SSL_CTX_use_RSAPrivateKey_file"},
 {ERR_PACK(0,SSL_F_SSL_DO_HANDSHAKE,0),	"SSL_do_handshake"},
 {ERR_PACK(0,SSL_F_SSL_GET_NEW_SESSION,0),	"SSL_GET_NEW_SESSION"},
+{ERR_PACK(0,SSL_F_SSL_GET_PREV_SESSION,0),	"SSL_GET_PREV_SESSION"},
 {ERR_PACK(0,SSL_F_SSL_GET_SERVER_SEND_CERT,0),	"SSL_GET_SERVER_SEND_CERT"},
 {ERR_PACK(0,SSL_F_SSL_GET_SIGN_PKEY,0),	"SSL_GET_SIGN_PKEY"},
 {ERR_PACK(0,SSL_F_SSL_INIT_WBIO_BUFFER,0),	"SSL_INIT_WBIO_BUFFER"},
@@ -162,6 +163,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_PACK(0,SSL_F_SSL_SET_PKEY,0),	"SSL_SET_PKEY"},
 {ERR_PACK(0,SSL_F_SSL_SET_RFD,0),	"SSL_set_rfd"},
 {ERR_PACK(0,SSL_F_SSL_SET_SESSION,0),	"SSL_set_session"},
+{ERR_PACK(0,SSL_F_SSL_SET_SESSION_ID_CONTEXT,0),	"SSL_set_session_id_context"},
 {ERR_PACK(0,SSL_F_SSL_SET_WFD,0),	"SSL_set_wfd"},
 {ERR_PACK(0,SSL_F_SSL_UNDEFINED_FUNCTION,0),	"SSL_UNDEFINED_FUNCTION"},
 {ERR_PACK(0,SSL_F_SSL_USE_CERTIFICATE,0),	"SSL_use_certificate"},
@@ -185,6 +187,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 static ERR_STRING_DATA SSL_str_reasons[]=
 	{
 {SSL_R_APP_DATA_IN_HANDSHAKE             ,"app data in handshake"},
+{SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT,"attempt to reuse session in different context"},
 {SSL_R_BAD_ALERT_RECORD                  ,"bad alert record"},
 {SSL_R_BAD_AUTHENTICATION_TYPE           ,"bad authentication type"},
 {SSL_R_BAD_CHANGE_CIPHER_SPEC            ,"bad change cipher spec"},
@@ -197,6 +200,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {SSL_R_BAD_DH_P_LENGTH                   ,"bad dh p length"},
 {SSL_R_BAD_DIGEST_LENGTH                 ,"bad digest length"},
 {SSL_R_BAD_DSA_SIGNATURE                 ,"bad dsa signature"},
+{SSL_R_BAD_LENGTH                        ,"bad length"},
 {SSL_R_BAD_MAC_DECODE                    ,"bad mac decode"},
 {SSL_R_BAD_MESSAGE_TYPE                  ,"bad message type"},
 {SSL_R_BAD_PACKET_LENGTH                 ,"bad packet length"},
@@ -327,6 +331,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION,"ssl ctx has no default ssl version"},
 {SSL_R_SSL_HANDSHAKE_FAILURE             ,"ssl handshake failure"},
 {SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS        ,"ssl library has no ciphers"},
+{SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG   ,"ssl session id context too long"},
 {SSL_R_SSL_SESSION_ID_IS_DIFFERENT       ,"ssl session id is different"},
 {SSL_R_TLSV1_ALERT_ACCESS_DENIED         ,"tlsv1 alert access denied"},
 {SSL_R_TLSV1_ALERT_DECODE_ERROR          ,"tlsv1 alert decode error"},
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 1091ee1009b93e86eedcf517bd130cecf096c839..3b6c364b016c6e192cc0a5560163c55d16f7c315 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -63,7 +63,7 @@
 #include "lhash.h"
 #include "ssl_locl.h"
 
-char *SSL_version_str="OpenSSL 0.9.2 31-Dec-1998";
+char *SSL_version_str=OPENSSL_VERSION_TEXT;
 
 static STACK *ssl_meth=NULL;
 static STACK *ssl_ctx_meth=NULL;
@@ -216,6 +216,20 @@ err:
 	return(NULL);
 	}
 
+int SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
+			       unsigned int sid_ctx_len)
+    {
+    if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
+	{
+	SSLerr(SSL_F_SSL_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
+	return 0;
+	}
+    ssl->sid_ctx_length=sid_ctx_len;
+    memcpy(ssl->sid_ctx,sid_ctx,sid_ctx_len);
+
+    return 1;
+    }
+
 void SSL_free(SSL *s)
 	{
 	int i;
@@ -485,6 +499,7 @@ void SSL_copy_session_id(SSL *t,SSL *f)
 	else
 		t->cert=NULL;
 	if (tmp != NULL) ssl_cert_free(tmp);
+	SSL_set_session_id_context(t,f->sid_ctx,f->sid_ctx_length);
 	}
 
 /* Fix this so it checks all the valid key/cert options */
@@ -1417,7 +1432,8 @@ SSL *SSL_dup(SSL *s)
         SSL *ret;
 	int i;
 		 
-	if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL) return(NULL);
+	if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL)
+	    return(NULL);
 			  
 	/* This copies version, session-id, SSL_METHOD and 'cert' */
 	SSL_copy_session_id(ret,s);
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 2403b066cb7c8fc5a30ca16d279fe1586769e9e1..d731634c70f30523fb1ab5aa913fbcf2acbfef85 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -190,6 +190,8 @@ int session;
 		ss->session_id_length=0;
 		}
 
+	memcpy(ss->sid_ctx,s->sid_ctx,s->sid_ctx_length);
+	ss->sid_ctx_length=s->sid_ctx_length;
 	s->session=ss;
 	ss->ssl_version=s->version;
 
@@ -202,13 +204,14 @@ unsigned char *session_id;
 int len;
 	{
 	SSL_SESSION *ret=NULL,data;
+	int copy=1;
 
 	/* conn_init();*/
 	data.ssl_version=s->version;
 	data.session_id_length=len;
 	if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
 		return(0);
-	memcpy(data.session_id,session_id,len);;
+	memcpy(data.session_id,session_id,len);
 
 	if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
 		{
@@ -219,26 +222,33 @@ int len;
 
 	if (ret == NULL)
 		{
-		int copy=1;
-
 		s->ctx->stats.sess_miss++;
 		ret=NULL;
-		if ((s->ctx->get_session_cb != NULL) &&
-			((ret=s->ctx->get_session_cb(s,session_id,len,&copy))
-				!= NULL))
+		if (s->ctx->get_session_cb != NULL
+		    && (ret=s->ctx->get_session_cb(s,session_id,len,&copy))
+		       != NULL)
 			{
 			s->ctx->stats.sess_cb_hit++;
 
 			/* The following should not return 1, otherwise,
 			 * things are very strange */
 			SSL_CTX_add_session(s->ctx,ret);
-			/* auto free it */
-			if (!copy)
-				SSL_SESSION_free(ret);
 			}
 		if (ret == NULL) return(0);
 		}
 
+	if((s->verify_mode&SSL_VERIFY_PEER)
+	   && (!s->sid_ctx_length || ret->sid_ctx_length != s->sid_ctx_length
+	       || memcmp(ret->sid_ctx,s->sid_ctx,ret->sid_ctx_length)))
+	    {
+	    SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
+	    return 0;
+	    }
+
+	/* auto free it */
+	if (!copy)
+	    SSL_SESSION_free(ret);
+
 	if (ret->cipher == NULL)
 		{
 		char buf[5],*p;
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index e41b738f5c9181cc9af4dbd910b06d8f3969558c..22fbb5f55b254298d164a8f5560189405297e39d 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -84,7 +84,7 @@ int SSL_SESSION_print(bp,x)
 BIO *bp;
 SSL_SESSION *x;
 	{
-	int i;
+	unsigned int i;
 	char str[128],*s;
 
 	if (x == NULL) goto err;
@@ -111,13 +111,19 @@ SSL_SESSION *x;
 		sprintf(str,"    Cipher    : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
 	if (BIO_puts(bp,str) <= 0) goto err;
 	if (BIO_puts(bp,"    Session-ID: ") <= 0) goto err;
-	for (i=0; i<(int)x->session_id_length; i++)
+	for (i=0; i<x->session_id_length; i++)
 		{
 		sprintf(str,"%02X",x->session_id[i]);
 		if (BIO_puts(bp,str) <= 0) goto err;
 		}
+	if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
+	for (i=0; i<x->sid_ctx_length; i++)
+		{
+		sprintf(str,"%02X",x->sid_ctx[i]);
+		if (BIO_puts(bp,str) <= 0) goto err;
+		}
 	if (BIO_puts(bp,"\n    Master-Key: ") <= 0) goto err;
-	for (i=0; i<(int)x->master_key_length; i++)
+	for (i=0; i<(unsigned int)x->master_key_length; i++)
 		{
 		sprintf(str,"%02X",x->master_key[i]);
 		if (BIO_puts(bp,str) <= 0) goto err;
@@ -128,7 +134,7 @@ SSL_SESSION *x;
 		if (BIO_puts(bp,"None") <= 0) goto err;
 		}
 	else
-		for (i=0; i<(int)x->key_arg_length; i++)
+		for (i=0; i<x->key_arg_length; i++)
 			{
 			sprintf(str,"%02X",x->key_arg[i]);
 			if (BIO_puts(bp,str) <= 0) goto err;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index a1f1a486938ebfb7322375de8b7a156b1e16265a..4534403d2292bb78749d76375f53450334b45419 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -60,7 +60,7 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
-char *tls1_version_str="TLSv1 part of OpenSSL 0.9.2 31-Dec-1998";
+char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
 
 #ifndef NO_PROTO
 static long tls1_default_timeout(void);
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 94cbab77d176dff78f6081409f54761080e275bb..5c030eea6a33b828dc4c3a7b245061b6da8b05be 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -303,27 +303,28 @@ bntest.o: ../include/bn.h ../include/cast.h ../include/crypto.h
 bntest.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
 bntest.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
 bntest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-bntest.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
-bntest.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
-bntest.o: ../include/rsa.h ../include/sha.h ../include/stack.h
-bntest.o: ../include/x509.h ../include/x509_vfy.h
+bntest.o: ../include/opensslv.h ../include/pkcs7.h ../include/rand.h
+bntest.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
+bntest.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
+bntest.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
 casttest.o: ../include/cast.h
 destest.o: ../include/des.h
 dhtest.o: ../include/bio.h ../include/bn.h ../include/crypto.h ../include/dh.h
-dhtest.o: ../include/stack.h
+dhtest.o: ../include/opensslv.h ../include/stack.h
 dsatest.o: ../include/bio.h ../include/bn.h ../include/crypto.h
-dsatest.o: ../include/dsa.h ../include/err.h ../include/rand.h
-dsatest.o: ../include/stack.h
+dsatest.o: ../include/dsa.h ../include/err.h ../include/opensslv.h
+dsatest.o: ../include/rand.h ../include/stack.h
 exptest.o: ../include/bio.h ../include/bn.h ../include/crypto.h
-exptest.o: ../include/err.h ../include/rand.h ../include/stack.h
+exptest.o: ../include/err.h ../include/opensslv.h ../include/rand.h
+exptest.o: ../include/stack.h
 hmactest.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
 hmactest.o: ../include/bn.h ../include/cast.h ../include/crypto.h
 hmactest.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/evp.h
 hmactest.o: ../include/hmac.h ../include/idea.h ../include/md2.h
 hmactest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-hmactest.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
-hmactest.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
-hmactest.o: ../include/stack.h
+hmactest.o: ../include/opensslv.h ../include/rc2.h ../include/rc4.h
+hmactest.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
+hmactest.o: ../include/sha.h ../include/stack.h
 ideatest.o: ../include/idea.h
 md2test.o: ../include/md2.h
 md5test.o: ../include/md5.h
@@ -334,7 +335,7 @@ rc4test.o: ../include/rc4.h
 rc5test.o: ../include/rc5.h
 rmdtest.o: ../include/ripemd.h
 rsa_oaep_test.o: ../include/bn.h ../include/crypto.h ../include/e_os.h
-rsa_oaep_test.o: ../include/rsa.h ../include/stack.h
+rsa_oaep_test.o: ../include/opensslv.h ../include/rsa.h ../include/stack.h
 sha1test.o: ../include/sha.h
 shatest.o: ../include/sha.h
 ssltest.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
@@ -343,8 +344,8 @@ ssltest.o: ../include/crypto.h ../include/des.h ../include/dh.h
 ssltest.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h
 ssltest.o: ../include/idea.h ../include/lhash.h ../include/md2.h
 ssltest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
-ssltest.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
-ssltest.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
-ssltest.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
+ssltest.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
+ssltest.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
+ssltest.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
 ssltest.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
 ssltest.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h
diff --git a/test/testsid.pem b/test/testsid.pem
index cd8617be2e694ce156fa6936c58b9dd86fa91d45..7ffd008f6660d17a9718ec9ee006ac80785ecab6 100644
--- a/test/testsid.pem
+++ b/test/testsid.pem
@@ -1,5 +1,5 @@
 -----BEGIN SSL SESSION PARAMETERS-----
-MIIBxwIBAQIBAgQDAQCABBCi11xa5qkOP8xrr02K/NQCBBBkIYQZM0Bt95W0EHNV
+MIIB1gIBAQIBAgQDAQCABBCi11xa5qkOP8xrr02K/NQCBBBkIYQZM0Bt95W0EHNV
 bA58oQYCBDIBr7WiBAICASyjggGGMIIBgjCCASwCAQMwDQYJKoZIhvcNAQEEBQAw
 ODELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3Jz
 YSB0ZXN0IENBMB4XDTk1MTAwOTIzMzEzNFoXDTk4MDcwNTIzMzEzNFowYDELMAkG
@@ -8,5 +8,5 @@ LjELMAkGA1UECxMCQ1MxGzAZBgNVBAMTElNTTGVheSBkZW1vIGNsaWVudDBcMA0G
 CSqGSIb3DQEBAQUAA0sAMEgCQQC4pcXEL1lgVA+B5Q3TcuW/O3LZHoA73IYm8oFD
 TezgCDhL2RTMn+seKWF36UtJKRIOBU9jZHCVVd0Me5ls6BEjAgMBAAEwDQYJKoZI
 hvcNAQEEBQADQQBoIpOcwUY1qlVF7j3ROSGvUsbvByOBFmYWkIBgsCqR+9qo1A7L
-CrWF5i8LWt/vLwAHaxWNx2YuBJMFyuK81fTv
+CrWF5i8LWt/vLwAHaxWNx2YuBJMFyuK81fTvpA0EC3Rlc3Rjb250ZXh0
 -----END SSL SESSION PARAMETERS-----
diff --git a/util/ssleay.num b/util/ssleay.num
index e45ca28979da458f2939d7168e73ee8177b396e6..9de659e6ca3cb54e8c50392ced0102ad472f5525 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -168,3 +168,4 @@ SSL_add_file_cert_subjects_to_stack     185
 SSL_set_tmp_rsa_callback                186
 SSL_set_tmp_dh_callback                 187
 SSL_add_dir_cert_subjects_to_stack      188
+SSL_set_session_id_context              189