'make update'

author Richard Levitte <levitte@openssl.org>

Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)

committer Richard Levitte <levitte@openssl.org>

Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)
author Richard Levitte <levitte@openssl.org>
Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)
committer Richard Levitte <levitte@openssl.org>
Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl

index 00a9918054ed908dc7caf1e640a47dd05e187958..42d8ea85f971e04c0cd291402d63fae94dd425f5 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -155,11 +155,11 @@ app_rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  app_rand.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  app_rand.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  app_rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-app_rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-app_rand.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-app_rand.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+app_rand.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+app_rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+app_rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
+app_rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h app_rand.c
  app_rand.o: apps.h
  apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -170,13 +170,13 @@ apps.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
  apps.o: ../include/openssl/err.h ../include/openssl/evp.h
  apps.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  apps.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-apps.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-apps.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
-apps.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
-apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-apps.o: ../include/openssl/types.h ../include/openssl/ui.h
+apps.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
+apps.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+apps.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+apps.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+apps.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
  apps.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  apps.o: ../include/openssl/x509v3.h apps.c apps.h
  asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -187,11 +187,11 @@ asn1pars.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  asn1pars.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  asn1pars.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-asn1pars.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-asn1pars.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+asn1pars.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+asn1pars.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+asn1pars.o: ../include/openssl/sha.h ../include/openssl/stack.h
+asn1pars.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  asn1pars.o: asn1pars.c
  ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -202,12 +202,12 @@ ca.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ca.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-ca.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ca.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ca.o: ../include/openssl/sha.h ../include/openssl/stack.h
-ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-ca.o: ../include/openssl/types.h ../include/openssl/x509.h
+ca.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ca.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ca.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ca.c
  ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ciphers.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -218,14 +218,14 @@ ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h
  ciphers.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ciphers.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ciphers.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ciphers.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-ciphers.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-ciphers.o: ../include/openssl/types.h ../include/openssl/x509.h
+ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ciphers.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ciphers.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ciphers.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ciphers.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  ciphers.o: ../include/openssl/x509_vfy.h apps.h ciphers.c
  crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  crl.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -235,11 +235,11 @@ crl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  crl.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  crl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-crl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-crl.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-crl.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+crl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+crl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+crl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+crl.o: ../include/openssl/sha.h ../include/openssl/stack.h
+crl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  crl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  crl.o: ../include/openssl/x509v3.h apps.h crl.c
  crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -250,11 +250,11 @@ crl2p7.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  crl2p7.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  crl2p7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-crl2p7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-crl2p7.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-crl2p7.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+crl2p7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+crl2p7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+crl2p7.o: ../include/openssl/sha.h ../include/openssl/stack.h
+crl2p7.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  crl2p7.o: crl2p7.c
  dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -265,11 +265,11 @@ dgst.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  dgst.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  dgst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  dgst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-dgst.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-dgst.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-dgst.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+dgst.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dgst.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h
+dgst.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dgst.c
  dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -279,11 +279,11 @@ dh.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  dh.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  dh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  dh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-dh.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-dh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-dh.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+dh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dh.o: ../include/openssl/sha.h ../include/openssl/stack.h
+dh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dh.c
  dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -293,11 +293,11 @@ dsa.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  dsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  dsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-dsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-dsa.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+dsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
+dsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h dsa.c
  dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -307,11 +307,11 @@ dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  dsaparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-dsaparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-dsaparam.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+dsaparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
+dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  dsaparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  dsaparam.o: dsaparam.c
  enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -322,12 +322,12 @@ enc.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  enc.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-enc.o: ../include/openssl/sha.h ../include/openssl/stack.h
-enc.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-enc.o: ../include/openssl/types.h ../include/openssl/x509.h
+enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+enc.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  enc.o: ../include/openssl/x509_vfy.h apps.h enc.c
  engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  engine.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -338,15 +338,15 @@ engine.o: ../include/openssl/engine.h ../include/openssl/err.h
  engine.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  engine.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  engine.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-engine.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-engine.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-engine.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-engine.o: ../include/openssl/types.h ../include/openssl/ui.h
+engine.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+engine.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+engine.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+engine.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+engine.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+engine.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+engine.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+engine.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+engine.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
  engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  engine.o: engine.c
  errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -358,14 +358,14 @@ errstr.o: ../include/openssl/err.h ../include/openssl/evp.h
  errstr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  errstr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-errstr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-errstr.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-errstr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-errstr.o: ../include/openssl/types.h ../include/openssl/x509.h
+errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+errstr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+errstr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+errstr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+errstr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+errstr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+errstr.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  errstr.o: ../include/openssl/x509_vfy.h apps.h errstr.c
  gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -375,12 +375,12 @@ gendh.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  gendh.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  gendh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  gendh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
-gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-gendh.o: ../include/openssl/types.h ../include/openssl/x509.h
+gendh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+gendh.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+gendh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+gendh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+gendh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  gendh.o: ../include/openssl/x509_vfy.h apps.h gendh.c
  gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -390,11 +390,11 @@ gendsa.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  gendsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  gendsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-gendsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-gendsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-gendsa.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+gendsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+gendsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+gendsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
+gendsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  gendsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  gendsa.o: gendsa.c
  genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -405,12 +405,12 @@ genrsa.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  genrsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  genrsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  genrsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
-genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-genrsa.o: ../include/openssl/types.h ../include/openssl/x509.h
+genrsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+genrsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+genrsa.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+genrsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+genrsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+genrsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  genrsa.o: ../include/openssl/x509_vfy.h apps.h genrsa.c
  nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  nseq.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -420,11 +420,11 @@ nseq.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  nseq.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  nseq.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-nseq.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-nseq.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-nseq.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+nseq.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+nseq.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+nseq.o: ../include/openssl/sha.h ../include/openssl/stack.h
+nseq.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  nseq.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h nseq.c
  ocsp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ocsp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -435,14 +435,14 @@ ocsp.o: ../include/openssl/err.h ../include/openssl/evp.h
  ocsp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ocsp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ocsp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-ocsp.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ocsp.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ocsp.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ocsp.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ocsp.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ocsp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ocsp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ocsp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ocsp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ocsp.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
  ocsp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  ocsp.o: ../include/openssl/x509v3.h apps.h ocsp.c
  openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -454,15 +454,15 @@ openssl.o: ../include/openssl/engine.h ../include/openssl/err.h
  openssl.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  openssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-openssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-openssl.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-openssl.o: ../include/openssl/types.h ../include/openssl/ui.h
+openssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+openssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+openssl.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+openssl.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
  openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  openssl.o: openssl.c progs.h s_apps.h
  passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -474,11 +474,11 @@ passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
  passwd.o: ../include/openssl/lhash.h ../include/openssl/md5.h
  passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-passwd.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-passwd.o: ../include/openssl/sha.h ../include/openssl/stack.h
-passwd.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-passwd.o: ../include/openssl/types.h ../include/openssl/x509.h
+passwd.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+passwd.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+passwd.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  passwd.o: ../include/openssl/x509_vfy.h apps.h passwd.c
  pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs12.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -488,12 +488,12 @@ pkcs12.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  pkcs12.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  pkcs12.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-pkcs12.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-pkcs12.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
-pkcs12.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h
-pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-pkcs12.o: ../include/openssl/types.h ../include/openssl/x509.h
+pkcs12.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
+pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+pkcs12.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+pkcs12.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+pkcs12.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  pkcs12.o: ../include/openssl/x509_vfy.h apps.h pkcs12.c
  pkcs7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs7.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -503,11 +503,11 @@ pkcs7.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  pkcs7.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  pkcs7.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-pkcs7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-pkcs7.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-pkcs7.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+pkcs7.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+pkcs7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+pkcs7.o: ../include/openssl/sha.h ../include/openssl/stack.h
+pkcs7.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  pkcs7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h pkcs7.c
  pkcs8.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs8.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -517,12 +517,12 @@ pkcs8.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  pkcs8.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  pkcs8.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-pkcs8.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-pkcs8.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
-pkcs8.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h
-pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-pkcs8.o: ../include/openssl/types.h ../include/openssl/x509.h
+pkcs8.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
+pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+pkcs8.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+pkcs8.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  pkcs8.o: ../include/openssl/x509_vfy.h apps.h pkcs8.c
  rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  rand.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -532,11 +532,11 @@ rand.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
-rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-rand.o: ../include/openssl/types.h ../include/openssl/x509.h
+rand.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+rand.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  rand.o: ../include/openssl/x509_vfy.h apps.h rand.c
  req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  req.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -546,11 +546,11 @@ req.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  req.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  req.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  req.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-req.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-req.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-req.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-req.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-req.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+req.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+req.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+req.o: ../include/openssl/sha.h ../include/openssl/stack.h
+req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  req.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  req.o: ../include/openssl/x509v3.h apps.h req.c
  rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -561,11 +561,11 @@ rsa.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  rsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  rsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-rsa.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+rsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+rsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
+rsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h rsa.c
  rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  rsautl.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -575,11 +575,11 @@ rsautl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  rsautl.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  rsautl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-rsautl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-rsautl.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-rsautl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-rsautl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-rsautl.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+rsautl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h
+rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  rsautl.o: rsautl.c
  s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -591,14 +591,14 @@ s_cb.o: ../include/openssl/err.h ../include/openssl/evp.h
  s_cb.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  s_cb.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_cb.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_cb.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_cb.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_cb.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_cb.o: ../include/openssl/types.h ../include/openssl/x509.h
+s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_cb.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_cb.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_cb.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  s_cb.o: ../include/openssl/x509_vfy.h apps.h s_apps.h s_cb.c
  s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -609,14 +609,14 @@ s_client.o: ../include/openssl/err.h ../include/openssl/evp.h
  s_client.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_client.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-s_client.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_client.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+s_client.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_client.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+s_client.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_client.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_client.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_client.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
  s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  s_client.o: s_apps.h s_client.c
  s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -628,14 +628,14 @@ s_server.o: ../include/openssl/err.h ../include/openssl/evp.h
  s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_server.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s_server.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_server.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+s_server.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
  s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  s_server.o: s_apps.h s_server.c
  s_socket.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -646,14 +646,14 @@ s_socket.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
  s_socket.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s_socket.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s_socket.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_socket.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_socket.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s_socket.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_socket.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+s_socket.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s_socket.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_socket.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_socket.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
  s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  s_socket.o: s_apps.h s_socket.c
  s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -665,14 +665,14 @@ s_time.o: ../include/openssl/err.h ../include/openssl/evp.h
  s_time.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  s_time.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_time.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_time.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-s_time.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_time.o: ../include/openssl/types.h ../include/openssl/x509.h
+s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_time.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_time.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_time.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_time.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_time.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_time.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  s_time.o: ../include/openssl/x509_vfy.h apps.h s_apps.h s_time.c
  sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  sess_id.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -683,14 +683,14 @@ sess_id.o: ../include/openssl/err.h ../include/openssl/evp.h
  sess_id.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  sess_id.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-sess_id.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-sess_id.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-sess_id.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-sess_id.o: ../include/openssl/types.h ../include/openssl/x509.h
+sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+sess_id.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+sess_id.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+sess_id.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+sess_id.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+sess_id.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+sess_id.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
  sess_id.o: ../include/openssl/x509_vfy.h apps.h sess_id.c
  smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  smime.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -700,11 +700,11 @@ smime.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  smime.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  smime.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-smime.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-smime.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-smime.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+smime.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+smime.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+smime.o: ../include/openssl/sha.h ../include/openssl/stack.h
+smime.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  smime.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h smime.c
  speed.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
@@ -718,13 +718,13 @@ speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h
  speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
  speed.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
  speed.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-speed.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-speed.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-speed.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+speed.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
+speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h speed.c
  speed.o: testdsa.h testrsa.h
  spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -735,11 +735,11 @@ spkac.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  spkac.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  spkac.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  spkac.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-spkac.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-spkac.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-spkac.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+spkac.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+spkac.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+spkac.o: ../include/openssl/sha.h ../include/openssl/stack.h
+spkac.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  spkac.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h spkac.c
  verify.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  verify.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -749,11 +749,11 @@ verify.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  verify.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  verify.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  verify.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-verify.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-verify.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-verify.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+verify.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+verify.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+verify.o: ../include/openssl/sha.h ../include/openssl/stack.h
+verify.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  verify.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  verify.o: ../include/openssl/x509v3.h apps.h verify.c
  version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -765,11 +765,11 @@ version.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  version.o: ../include/openssl/idea.h ../include/openssl/lhash.h
  version.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h
  version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-version.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-version.o: ../include/openssl/rc4.h ../include/openssl/rsa.h
-version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-version.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h
+version.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+version.o: ../include/openssl/sha.h ../include/openssl/stack.h
+version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  version.o: version.c
  x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -780,10 +780,10 @@ x509.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  x509.o: ../include/openssl/evp.h ../include/openssl/lhash.h
  x509.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-x509.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-x509.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-x509.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-x509.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-x509.o: ../include/openssl/txt_db.h ../include/openssl/types.h
+x509.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+x509.o: ../include/openssl/sha.h ../include/openssl/stack.h
+x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
  x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  x509.o: ../include/openssl/x509v3.h apps.h x509.c
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl

index 99b9b820b3f2cd5bdf7f45d662c5a0303dd24daf..9642803a4240326f510c15a390fc9a888ca55285 100644 (file)
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -115,35 +115,35 @@ a_bitstr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_bitstr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_bitstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_bitstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_bitstr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_bitstr.o: ../../include/openssl/types.h ../cryptlib.h a_bitstr.c
+a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_bitstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_bitstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bitstr.c
  a_bool.o: ../../e_os.h ../../include/openssl/asn1.h
  a_bool.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
  a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_bool.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_bool.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_bool.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_bool.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_bool.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_bool.o: ../cryptlib.h a_bool.c
  a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h
  a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_bytes.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_bytes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_bytes.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_bytes.o: ../../include/openssl/types.h ../cryptlib.h a_bytes.c
+a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_bytes.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_bytes.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bytes.c
  a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h
  a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
  a_d2i_fp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_d2i_fp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_d2i_fp.o: ../../include/openssl/opensslconf.h
-a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_d2i_fp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_d2i_fp.o: ../../include/openssl/types.h ../cryptlib.h a_d2i_fp.c
+a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_d2i_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_d2i_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_d2i_fp.c
  a_digest.o: ../../e_os.h ../../include/openssl/asn1.h
  a_digest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_digest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -152,10 +152,10 @@ a_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  a_digest.o: ../../include/openssl/opensslconf.h
-a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+a_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+a_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  a_digest.o: ../cryptlib.h a_digest.c
  a_dup.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -163,65 +163,65 @@ a_dup.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_dup.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_dup.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_dup.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_dup.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_dup.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_dup.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_dup.o: ../cryptlib.h a_dup.c
  a_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_enum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_enum.o: ../cryptlib.h a_enum.c
  a_gentm.o: ../../e_os.h ../../include/openssl/asn1.h
  a_gentm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_gentm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_gentm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_gentm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_gentm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_gentm.o: ../../include/openssl/types.h ../cryptlib.h ../o_time.h a_gentm.c
+a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_gentm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_gentm.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_gentm.c
  a_hdr.o: ../../e_os.h ../../include/openssl/asn1.h
  a_hdr.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
  a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_hdr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_hdr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_hdr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_hdr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_hdr.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_hdr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_hdr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_hdr.o: ../cryptlib.h a_hdr.c
  a_i2d_fp.o: ../../e_os.h ../../include/openssl/asn1.h
  a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_i2d_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_i2d_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_i2d_fp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_i2d_fp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_i2d_fp.o: ../../include/openssl/types.h ../cryptlib.h a_i2d_fp.c
+a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_i2d_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_i2d_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_i2d_fp.c
  a_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_int.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_int.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_int.o: ../cryptlib.h a_int.c
  a_mbstr.o: ../../e_os.h ../../include/openssl/asn1.h
  a_mbstr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_mbstr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_mbstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_mbstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_mbstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_mbstr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_mbstr.o: ../../include/openssl/types.h ../cryptlib.h a_mbstr.c
+a_mbstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_mbstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_mbstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_mbstr.c
  a_meth.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_meth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_meth.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_meth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_meth.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_meth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_meth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_meth.o: ../cryptlib.h a_meth.c
  a_object.o: ../../e_os.h ../../include/openssl/asn1.h
  a_object.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -229,33 +229,33 @@ a_object.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_object.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_object.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_object.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_object.o: ../../include/openssl/types.h ../cryptlib.h a_object.c
+a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_object.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h a_object.c
  a_octet.o: ../../e_os.h ../../include/openssl/asn1.h
  a_octet.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_octet.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_octet.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_octet.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_octet.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_octet.o: ../../include/openssl/types.h ../cryptlib.h a_octet.c
+a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_octet.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_octet.o: ../../include/openssl/symhacks.h ../cryptlib.h a_octet.c
  a_print.o: ../../e_os.h ../../include/openssl/asn1.h
  a_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_print.o: ../../include/openssl/types.h ../cryptlib.h a_print.c
+a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_print.o: ../../include/openssl/symhacks.h ../cryptlib.h a_print.c
  a_set.o: ../../e_os.h ../../include/openssl/asn1.h
  a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
  a_set.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_set.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_set.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_set.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_set.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_set.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_set.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_set.o: ../cryptlib.h a_set.c
  a_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -264,10 +264,10 @@ a_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  a_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  a_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  a_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  a_sign.o: ../cryptlib.h a_sign.c
  a_strex.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -277,10 +277,10 @@ a_strex.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  a_strex.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_strex.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_strex.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+a_strex.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+a_strex.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_strex.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_strex.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  a_strex.o: ../../include/openssl/x509_vfy.h a_strex.c charmap.h
  a_strnid.o: ../../e_os.h ../../include/openssl/asn1.h
  a_strnid.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -288,17 +288,17 @@ a_strnid.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_strnid.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_strnid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  a_strnid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_strnid.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_strnid.o: ../../include/openssl/types.h ../cryptlib.h a_strnid.c
+a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_strnid.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_strnid.o: ../../include/openssl/symhacks.h ../cryptlib.h a_strnid.c
  a_time.o: ../../e_os.h ../../include/openssl/asn1.h
  a_time.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
  a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_time.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_time.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_time.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_time.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_time.o: ../cryptlib.h ../o_time.h a_time.c
  a_type.o: ../../e_os.h ../../include/openssl/asn1.h
  a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
@@ -306,24 +306,24 @@ a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_type.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_type.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_type.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_type.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_type.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_type.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_type.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_type.o: ../cryptlib.h a_type.c
  a_utctm.o: ../../e_os.h ../../include/openssl/asn1.h
  a_utctm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_utctm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_utctm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_utctm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_utctm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_utctm.o: ../../include/openssl/types.h ../cryptlib.h ../o_time.h a_utctm.c
+a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_utctm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_utctm.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_utctm.c
  a_utf8.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  a_utf8.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  a_utf8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_utf8.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_utf8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+a_utf8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_utf8.o: ../cryptlib.h a_utf8.c
  a_verify.o: ../../e_os.h ../../include/openssl/asn1.h
  a_verify.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -333,44 +333,44 @@ a_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  a_verify.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  a_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  a_verify.o: ../../include/openssl/opensslconf.h
-a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+a_verify.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+a_verify.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  a_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  a_verify.o: ../cryptlib.h a_verify.c
  asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  asn1_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  asn1_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  asn1_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-asn1_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-asn1_err.o: ../../include/openssl/types.h asn1_err.c
+asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+asn1_err.o: ../../include/openssl/symhacks.h asn1_err.c
  asn1_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  asn1_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  asn1_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  asn1_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  asn1_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-asn1_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-asn1_lib.o: ../../include/openssl/types.h ../cryptlib.h asn1_lib.c
+asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+asn1_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+asn1_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_lib.c
  asn1_par.o: ../../e_os.h ../../include/openssl/asn1.h
  asn1_par.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  asn1_par.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  asn1_par.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  asn1_par.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  asn1_par.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-asn1_par.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-asn1_par.o: ../../include/openssl/types.h ../cryptlib.h asn1_par.c
+asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+asn1_par.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+asn1_par.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_par.c
  asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h
  asn_pack.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  asn_pack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  asn_pack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  asn_pack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-asn_pack.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-asn_pack.o: ../../include/openssl/types.h ../cryptlib.h asn_pack.c
+asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+asn_pack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+asn_pack.o: ../../include/openssl/symhacks.h ../cryptlib.h asn_pack.c
  d2i_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  d2i_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  d2i_pr.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
@@ -378,9 +378,9 @@ d2i_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  d2i_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-d2i_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-d2i_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+d2i_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  d2i_pr.o: ../cryptlib.h d2i_pr.c
  d2i_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -389,9 +389,9 @@ d2i_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  d2i_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  d2i_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-d2i_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-d2i_pu.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+d2i_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  d2i_pu.o: ../cryptlib.h d2i_pu.c
  evp_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
  evp_asn1.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
@@ -399,33 +399,33 @@ evp_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  evp_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  evp_asn1.o: ../../include/openssl/opensslconf.h
-evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-evp_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_asn1.o: ../../include/openssl/types.h ../cryptlib.h evp_asn1.c
+evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+evp_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_asn1.c
  f_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  f_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  f_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  f_enum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  f_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-f_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+f_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+f_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  f_enum.o: ../cryptlib.h f_enum.c
  f_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  f_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  f_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  f_int.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  f_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-f_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-f_int.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+f_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+f_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  f_int.o: ../cryptlib.h f_int.c
  f_string.o: ../../e_os.h ../../include/openssl/asn1.h
  f_string.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  f_string.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  f_string.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  f_string.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-f_string.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-f_string.o: ../../include/openssl/types.h ../cryptlib.h f_string.c
+f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+f_string.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+f_string.o: ../../include/openssl/symhacks.h ../cryptlib.h f_string.c
  i2d_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  i2d_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  i2d_pr.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
@@ -433,9 +433,9 @@ i2d_pr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  i2d_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  i2d_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-i2d_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-i2d_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  i2d_pr.o: ../cryptlib.h i2d_pr.c
  i2d_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -444,9 +444,9 @@ i2d_pu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  i2d_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  i2d_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  i2d_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-i2d_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-i2d_pu.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  i2d_pu.o: ../cryptlib.h i2d_pu.c
  n_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  n_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/asn1t.h
@@ -457,10 +457,10 @@ n_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  n_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  n_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-n_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-n_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-n_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-n_pkey.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+n_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+n_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  n_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h n_pkey.c
  nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  nsseq.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -469,10 +469,10 @@ nsseq.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  nsseq.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
  nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-nsseq.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+nsseq.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+nsseq.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  nsseq.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h nsseq.c
  p5_pbe.o: ../../e_os.h ../../include/openssl/asn1.h
  p5_pbe.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
@@ -482,11 +482,11 @@ p5_pbe.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p5_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p5_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p5_pbe.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_pbe.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p5_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p5_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p5_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_pbe.c
  p5_pbev2.o: ../../e_os.h ../../include/openssl/asn1.h
  p5_pbev2.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
@@ -496,11 +496,11 @@ p5_pbev2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p5_pbev2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p5_pbev2.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_pbev2.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p5_pbev2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p5_pbev2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_pbev2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_pbev2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p5_pbev2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_pbev2.c
  p8_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  p8_pkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
@@ -510,10 +510,10 @@ p8_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p8_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p8_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p8_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p8_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p8_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p8_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p8_pkey.o: ../cryptlib.h p8_pkey.c
  t_bitst.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -524,10 +524,10 @@ t_bitst.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  t_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  t_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  t_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-t_bitst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-t_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-t_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+t_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+t_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  t_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  t_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h t_bitst.c
  t_crl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -538,10 +538,10 @@ t_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_crl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  t_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  t_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-t_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_crl.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+t_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+t_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  t_crl.o: ../cryptlib.h t_crl.c
  t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -550,9 +550,9 @@ t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  t_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  t_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-t_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_pkey.o: ../../include/openssl/types.h ../cryptlib.h t_pkey.c
+t_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
+t_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+t_pkey.o: ../../include/openssl/symhacks.h ../cryptlib.h t_pkey.c
  t_req.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  t_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  t_req.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
@@ -561,10 +561,10 @@ t_req.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-t_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_req.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+t_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  t_req.o: ../cryptlib.h t_req.c
  t_spki.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -574,10 +574,10 @@ t_spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  t_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-t_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-t_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-t_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+t_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  t_spki.o: ../cryptlib.h t_spki.c
  t_x509.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -588,10 +588,10 @@ t_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-t_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_x509.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  t_x509.o: ../cryptlib.h t_x509.c
  t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -602,10 +602,10 @@ t_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  t_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-t_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_x509a.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+t_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+t_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  t_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h t_x509a.c
  tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -613,50 +613,50 @@ tasn_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  tasn_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  tasn_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tasn_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_dec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_dec.o: ../../include/openssl/types.h tasn_dec.c
+tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_dec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_dec.o: ../../include/openssl/symhacks.h tasn_dec.c
  tasn_enc.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_enc.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  tasn_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  tasn_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  tasn_enc.o: ../../include/openssl/opensslconf.h
-tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_enc.o: ../../include/openssl/types.h tasn_enc.c
+tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_enc.o: ../../include/openssl/symhacks.h tasn_enc.c
  tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  tasn_fre.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  tasn_fre.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  tasn_fre.o: ../../include/openssl/opensslconf.h
-tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_fre.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_fre.o: ../../include/openssl/types.h tasn_fre.c
+tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c
  tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  tasn_new.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  tasn_new.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  tasn_new.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  tasn_new.o: ../../include/openssl/opensslconf.h
-tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_new.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_new.o: ../../include/openssl/types.h tasn_new.c
+tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c
  tasn_typ.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_typ.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  tasn_typ.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  tasn_typ.o: ../../include/openssl/opensslconf.h
-tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_typ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_typ.o: ../../include/openssl/types.h tasn_typ.c
+tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_typ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_typ.o: ../../include/openssl/symhacks.h tasn_typ.c
  tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  tasn_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  tasn_utl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  tasn_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  tasn_utl.o: ../../include/openssl/opensslconf.h
-tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-tasn_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tasn_utl.o: ../../include/openssl/types.h tasn_utl.c
+tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tasn_utl.o: ../../include/openssl/symhacks.h tasn_utl.c
  x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
  x_algor.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  x_algor.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -664,10 +664,10 @@ x_algor.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x_algor.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
  x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_algor.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_algor.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_algor.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_algor.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_algor.o: x_algor.c
  x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -678,10 +678,10 @@ x_attrib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_attrib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_attrib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_attrib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_attrib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_attrib.o: ../cryptlib.h x_attrib.c
  x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -690,9 +690,9 @@ x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  x_bignum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  x_bignum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  x_bignum.o: ../../include/openssl/opensslconf.h
-x_bignum.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-x_bignum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x_bignum.o: ../../include/openssl/types.h ../cryptlib.h x_bignum.c
+x_bignum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_bignum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+x_bignum.o: ../../include/openssl/symhacks.h ../cryptlib.h x_bignum.c
  x_crl.o: ../../e_os.h ../../include/openssl/asn1.h
  x_crl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
  x_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -701,10 +701,10 @@ x_crl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_crl.o: ../cryptlib.h x_crl.c
  x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
@@ -714,10 +714,10 @@ x_exten.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x_exten.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
  x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_exten.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_exten.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_exten.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_exten.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_exten.o: x_exten.c
  x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -727,10 +727,10 @@ x_info.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_info.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_info.o: ../cryptlib.h x_info.c
  x_long.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -739,8 +739,8 @@ x_long.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  x_long.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  x_long.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  x_long.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_long.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-x_long.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_long.o: ../cryptlib.h x_long.c
  x_name.o: ../../e_os.h ../../include/openssl/asn1.h
  x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
@@ -750,10 +750,10 @@ x_name.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_name.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_name.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_name.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_name.o: ../cryptlib.h x_name.c
  x_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -764,10 +764,10 @@ x_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_pkey.o: ../cryptlib.h x_pkey.c
  x_pubkey.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -778,10 +778,10 @@ x_pubkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_pubkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_pubkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_pubkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_pubkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_pubkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_pubkey.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_pubkey.o: ../cryptlib.h x_pubkey.c
  x_req.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -792,10 +792,10 @@ x_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_req.o: ../cryptlib.h x_req.c
  x_sig.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -806,10 +806,10 @@ x_sig.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_sig.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_sig.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_sig.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_sig.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_sig.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_sig.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_sig.o: ../cryptlib.h x_sig.c
  x_spki.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -820,10 +820,10 @@ x_spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_spki.o: ../cryptlib.h x_spki.c
  x_val.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -834,10 +834,10 @@ x_val.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_val.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_val.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_val.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_val.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_val.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_val.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_val.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_val.o: ../cryptlib.h x_val.c
  x_x509.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -849,10 +849,10 @@ x_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x_x509.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+x_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+x_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  x_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  x_x509.o: ../cryptlib.h x_x509.c
  x_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -863,9 +863,9 @@ x_x509a.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_x509a.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_x509a.o: ../cryptlib.h x_x509a.c
diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl

index 8ca341ab28c098642510a6c88a7549e21e6899b5..103a051c03f89d390757e31bc576d7ac53e8cf02 100644 (file)
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -121,9 +121,9 @@ bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h
  bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  bf_nbio.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bf_nbio.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bf_nbio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bf_nbio.o: ../cryptlib.h bf_nbio.c
  bf_null.o: ../../e_os.h ../../include/openssl/bio.h
  bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl

index d9c0a682d402f046f0888a109618c4f9f298bcc0..605cb17577c023ae5c9ae19993f5956da1034b96 100644 (file)
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -283,9 +283,9 @@ bn_prime.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  bn_prime.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bn_prime.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bn_prime.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_prime.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bn_prime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bn_prime.o: ../cryptlib.h bn_lcl.h bn_prime.c bn_prime.h
  bn_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -298,9 +298,9 @@ bn_rand.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  bn_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bn_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bn_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bn_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bn_rand.o: ../cryptlib.h bn_lcl.h bn_rand.c
  bn_recp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl

index ccef2ac9adf90d4a29665f9fe8282b2a6a3012e2..22a03a63c2083d20f214940bcc5c1e57def103c8 100644 (file)
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@@ -87,21 +87,21 @@ c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
  c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  c_rle.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-c_rle.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h c_rle.c
+c_rle.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+c_rle.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h c_rle.c
  c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
  c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  c_zlib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-c_zlib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+c_zlib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+c_zlib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  c_zlib.o: c_zlib.c
  comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
  comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  comp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  comp_lib.o: ../../include/openssl/opensslconf.h
-comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-comp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-comp_lib.o: ../../include/openssl/types.h comp_lib.c
+comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl

index f12d82b81fde88827f7a46ae150adb13ed25be83..68fd3c4cbc2c676e6cd1c8da796f92a27f5a22b3 100644 (file)
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -173,9 +173,9 @@ enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  enc_writ.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
  enc_writ.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  enc_writ.o: ../../include/openssl/opensslconf.h
-enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-enc_writ.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
  fcrypt.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
  fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h fcrypt.c
@@ -192,8 +192,9 @@ pcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h pcbc_enc.c
  qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
  qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h qud_cksm.c
  rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-rand_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
-rand_key.o: ../../include/openssl/types.h rand_key.c
+rand_key.o: ../../include/openssl/opensslconf.h
+rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+rand_key.o: rand_key.c
  rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
  rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h
  rpc_enc.o: rpc_enc.c
diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl

index 1e8f135af609fa9cc34b567ec5a9681ae115b2e5..9dddf8dd619ac90613f53fbb6dee37acfc283b5f 100644 (file)
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -86,31 +86,31 @@ dh_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dh_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  dh_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  dh_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-dh_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dh_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_asn1.o: ../../include/openssl/types.h ../cryptlib.h dh_asn1.c
+dh_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dh_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_asn1.c
  dh_check.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
  dh_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dh_check.o: ../../include/openssl/opensslconf.h
-dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dh_check.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_check.o: ../../include/openssl/types.h ../cryptlib.h dh_check.c
+dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c
  dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dh_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  dh_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dh_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dh_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_err.o: ../../include/openssl/types.h dh_err.c
+dh_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dh_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_err.o: ../../include/openssl/symhacks.h dh_err.c
  dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
  dh_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dh_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  dh_gen.o: ../cryptlib.h dh_gen.c
  dh_key.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  dh_key.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -118,10 +118,10 @@ dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dh_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  dh_key.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  dh_key.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dh_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dh_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dh_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_key.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+dh_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dh_key.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  dh_key.o: ../cryptlib.h dh_key.c
  dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  dh_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -129,8 +129,8 @@ dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dh_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dh_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dh_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_lib.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dh_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  dh_lib.o: ../cryptlib.h dh_lib.c
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl

index cf761639cb75eaeb8388b1f8cc7b0fc311457626..e780ee429b91aa04078ef73bd10541285c8a768f 100644 (file)
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -88,16 +88,16 @@ dsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dsa_asn1.o: ../../include/openssl/opensslconf.h
-dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_asn1.o: ../../include/openssl/types.h ../cryptlib.h dsa_asn1.c
+dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c
  dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  dsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+dsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  dsa_err.o: dsa_err.c
  dsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
  dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -107,18 +107,18 @@ dsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  dsa_gen.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  dsa_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  dsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
-dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+dsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+dsa_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  dsa_gen.o: ../cryptlib.h dsa_gen.c
  dsa_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
  dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dsa_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  dsa_key.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_key.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  dsa_key.o: ../cryptlib.h dsa_key.c
  dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -127,9 +127,9 @@ dsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+dsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  dsa_lib.o: ../../include/openssl/ui.h ../cryptlib.h dsa_lib.c
  dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
  dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -138,10 +138,10 @@ dsa_ossl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dsa_ossl.o: ../../include/openssl/opensslconf.h
-dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_ossl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_ossl.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_ossl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dsa_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_ossl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  dsa_ossl.o: ../cryptlib.h dsa_ossl.c
  dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
  dsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -150,10 +150,10 @@ dsa_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dsa_sign.o: ../../include/openssl/opensslconf.h
-dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_sign.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  dsa_sign.o: ../cryptlib.h dsa_sign.c
  dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
  dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
@@ -162,8 +162,8 @@ dsa_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_vrf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  dsa_vrf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  dsa_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dsa_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_vrf.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+dsa_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+dsa_vrf.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dsa_vrf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  dsa_vrf.o: ../cryptlib.h dsa_vrf.c
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl

index 22d297da5d2f8b4569ab112fe9a80f8b2faaf3c2..7b43700a2bb80ce645babccfc59d947138d69912 100644 (file)
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -95,9 +95,9 @@ eng_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_all.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-eng_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-eng_all.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_all.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+eng_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+eng_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+eng_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  eng_all.o: ../../include/openssl/ui.h eng_all.c eng_int.h
  eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -106,10 +106,10 @@ eng_ctrl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_ctrl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_ctrl.o: ../../include/openssl/opensslconf.h
-eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_ctrl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_ctrl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_ctrl.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_ctrl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_ctrl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_ctrl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  eng_ctrl.o: ../cryptlib.h eng_ctrl.c eng_int.h
  eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_dyn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -118,10 +118,10 @@ eng_dyn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_dyn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
  eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  eng_dyn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-eng_dyn.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_dyn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_dyn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_dyn.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+eng_dyn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_dyn.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_dyn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_dyn.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  eng_dyn.o: ../cryptlib.h eng_dyn.c eng_int.h
  eng_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  eng_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -129,9 +129,9 @@ eng_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-eng_err.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-eng_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+eng_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+eng_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  eng_err.o: ../../include/openssl/ui.h eng_err.c
  eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -140,9 +140,9 @@ eng_fat.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_fat.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_fat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-eng_fat.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_fat.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+eng_fat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+eng_fat.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+eng_fat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  eng_fat.o: ../../include/openssl/ui.h ../cryptlib.h eng_fat.c eng_int.h
  eng_init.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_init.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -151,10 +151,10 @@ eng_init.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_init.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_init.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_init.o: ../../include/openssl/opensslconf.h
-eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_init.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_init.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_init.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_init.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_init.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  eng_init.o: ../cryptlib.h eng_init.c eng_int.h
  eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -163,9 +163,9 @@ eng_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-eng_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-eng_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+eng_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+eng_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+eng_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  eng_lib.o: ../../include/openssl/ui.h ../cryptlib.h eng_int.h eng_lib.c
  eng_list.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_list.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -174,10 +174,10 @@ eng_list.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_list.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_list.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_list.o: ../../include/openssl/opensslconf.h
-eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_list.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_list.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_list.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_list.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  eng_list.o: ../cryptlib.h eng_int.h eng_list.c
  eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -188,12 +188,12 @@ eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  eng_openssl.o: ../../include/openssl/opensslconf.h
-eng_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+eng_openssl.o: ../../include/openssl/opensslv.h
+eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
  eng_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rsa.h
  eng_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
  eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_openssl.o: ../../include/openssl/types.h ../../include/openssl/ui.h
-eng_openssl.o: ../cryptlib.h eng_openssl.c
+eng_openssl.o: ../../include/openssl/ui.h ../cryptlib.h eng_openssl.c
  eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  eng_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  eng_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -201,10 +201,10 @@ eng_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  eng_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  eng_pkey.o: ../../include/openssl/opensslconf.h
-eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_pkey.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c
  eng_table.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  eng_table.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -214,11 +214,11 @@ eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  eng_table.o: ../../include/openssl/objects.h
  eng_table.o: ../../include/openssl/opensslconf.h
-eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-eng_table.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_table.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
-eng_table.o: eng_table.c
+eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+eng_table.o: eng_int.h eng_table.c
  hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
  hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -226,10 +226,10 @@ hw_atalla.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  hw_atalla.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
  hw_atalla.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  hw_atalla.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_atalla.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_atalla.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_atalla.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_atalla.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_atalla.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hw_atalla.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  hw_atalla.o: ../cryptlib.h hw_atalla.c vendor_defns/atalla.h
  hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
  hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -238,10 +238,10 @@ hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  hw_cswift.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
  hw_cswift.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  hw_cswift.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_cswift.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_cswift.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_cswift.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  hw_cswift.o: ../cryptlib.h hw_cswift.c vendor_defns/cswift.h
  hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h
  hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -252,12 +252,12 @@ hw_ncipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  hw_ncipher.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  hw_ncipher.o: ../../include/openssl/opensslconf.h
-hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-hw_ncipher.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-hw_ncipher.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-hw_ncipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-hw_ncipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_ncipher.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  hw_ncipher.o: ../cryptlib.h hw_ncipher.c vendor_defns/hwcryptohook.h
  hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -267,10 +267,10 @@ hw_nuron.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  hw_nuron.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
  hw_nuron.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  hw_nuron.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_nuron.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_nuron.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_nuron.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  hw_nuron.o: ../cryptlib.h hw_nuron.c
  hw_openbsd_dev_crypto.o: hw_openbsd_dev_crypto.c
  hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -280,10 +280,10 @@ hw_ubsec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  hw_ubsec.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
  hw_ubsec.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  hw_ubsec.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-hw_ubsec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_ubsec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_ubsec.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_ubsec.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  hw_ubsec.o: ../cryptlib.h hw_ubsec.c vendor_defns/hw_ubsec.h
  tb_cipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -293,11 +293,11 @@ tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_cipher.o: ../../include/openssl/objects.h
  tb_cipher.o: ../../include/openssl/opensslconf.h
-tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_cipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_cipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_cipher.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
-tb_cipher.o: tb_cipher.c
+tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_cipher.o: eng_int.h tb_cipher.c
  tb_dh.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  tb_dh.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -305,10 +305,10 @@ tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  tb_dh.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_dh.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_dh.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
+tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_dh.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h
  tb_dh.o: tb_dh.c
  tb_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -318,11 +318,11 @@ tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_digest.o: ../../include/openssl/objects.h
  tb_digest.o: ../../include/openssl/opensslconf.h
-tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_digest.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
-tb_digest.o: tb_digest.c
+tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_digest.o: eng_int.h tb_digest.c
  tb_dsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  tb_dsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -330,10 +330,10 @@ tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_dsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_dsa.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
+tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_dsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h
  tb_dsa.o: tb_dsa.c
  tb_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -342,11 +342,11 @@ tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_rand.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_rand.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
-tb_rand.o: tb_rand.c
+tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_rand.o: eng_int.h tb_rand.c
  tb_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  tb_rsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -354,8 +354,8 @@ tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-tb_rsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_rsa.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h
+tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+tb_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h
  tb_rsa.o: tb_rsa.c
diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl

index fb3396d73dfdb3897b087c4c875f78e0a24f8703..2946c00ead4b06cc11b9378497d2c856f70f7a3f 100644 (file)
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -95,11 +95,11 @@ err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
-err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h
+err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  err_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
  err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  err_all.o: err_all.c
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl

index 3e57057323809732a5935c6ab802f7f68e0be358..0999f31a2e06670701536f6ebbb6bccbc7c11656 100644 (file)
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -105,8 +105,8 @@ bio_b64.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  bio_b64.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  bio_b64.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  bio_b64.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bio_b64.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_b64.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bio_b64.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+bio_b64.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bio_b64.o: ../cryptlib.h bio_b64.c
  bio_enc.o: ../../e_os.h ../../include/openssl/asn1.h
  bio_enc.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -115,8 +115,8 @@ bio_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  bio_enc.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  bio_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  bio_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bio_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bio_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+bio_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bio_enc.o: ../cryptlib.h bio_enc.c
  bio_md.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bio_md.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -124,18 +124,18 @@ bio_md.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  bio_md.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  bio_md.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  bio_md.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_md.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bio_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-bio_md.o: ../../include/openssl/types.h ../cryptlib.h bio_md.c
+bio_md.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bio_md.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bio_md.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_md.c
  bio_ok.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bio_ok.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  bio_ok.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  bio_ok.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  bio_ok.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  bio_ok.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_ok.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_ok.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bio_ok.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bio_ok.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bio_ok.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  bio_ok.o: ../cryptlib.h bio_ok.c
  c_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -143,9 +143,9 @@ c_all.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  c_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-c_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-c_all.o: ../../include/openssl/types.h ../cryptlib.h c_all.c
+c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+c_all.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+c_all.o: ../../include/openssl/symhacks.h ../cryptlib.h c_all.c
  c_allc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_allc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  c_allc.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
@@ -153,11 +153,11 @@ c_allc.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  c_allc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  c_allc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-c_allc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-c_allc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-c_allc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-c_allc.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+c_allc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+c_allc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+c_allc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  c_allc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_allc.c
  c_alld.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_alld.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -166,11 +166,11 @@ c_alld.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  c_alld.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  c_alld.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-c_alld.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-c_alld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-c_alld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-c_alld.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+c_alld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+c_alld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+c_alld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  c_alld.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_alld.c
  digest.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  digest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -180,9 +180,9 @@ digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-digest.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-digest.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+digest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  digest.o: ../../include/openssl/ui.h ../cryptlib.h digest.c
  e_aes.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_aes.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -190,9 +190,9 @@ e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_aes.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-e_aes.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_aes.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h e_aes.c
+e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rd_fst.h
+e_aes.o: ../../include/openssl/rijndael.h ../../include/openssl/safestack.h
+e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_aes.c
  e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_bf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -200,8 +200,8 @@ e_bf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  e_bf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  e_bf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_bf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_bf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_bf.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_bf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_bf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_bf.o: ../cryptlib.h e_bf.c evp_locl.h
  e_cast.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_cast.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -210,8 +210,8 @@ e_cast.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  e_cast.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  e_cast.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_cast.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_cast.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_cast.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_cast.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_cast.o: ../cryptlib.h e_cast.c evp_locl.h
  e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_des.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -220,8 +220,8 @@ e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_des.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_des.o: ../cryptlib.h e_des.c evp_locl.h
  e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_des3.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -230,8 +230,8 @@ e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_des3.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_des3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_des3.o: ../cryptlib.h e_des3.c evp_locl.h
  e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_idea.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -240,8 +240,8 @@ e_idea.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_idea.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
  e_idea.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  e_idea.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_idea.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_idea.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_idea.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+e_idea.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_idea.o: ../cryptlib.h e_idea.c evp_locl.h
  e_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -249,18 +249,18 @@ e_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  e_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_null.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  e_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_null.o: ../../include/openssl/types.h ../cryptlib.h e_null.c
+e_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+e_null.o: ../../include/openssl/symhacks.h ../cryptlib.h e_null.c
  e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  e_rc2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  e_rc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_rc2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  e_rc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_rc2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_rc2.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_rc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_rc2.o: ../../include/openssl/rc2.h ../../include/openssl/safestack.h
+e_rc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_rc2.o: ../cryptlib.h e_rc2.c evp_locl.h
  e_rc4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc4.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -268,9 +268,9 @@ e_rc4.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  e_rc4.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_rc4.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  e_rc4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc4.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h
-e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_rc4.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_rc4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_rc4.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h
+e_rc4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_rc4.o: ../cryptlib.h e_rc4.c
  e_rc5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -278,9 +278,9 @@ e_rc5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  e_rc5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  e_rc5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h
-e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_rc5.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_rc5.o: ../../include/openssl/rc5.h ../../include/openssl/safestack.h
+e_rc5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  e_rc5.o: ../cryptlib.h e_rc5.c evp_locl.h
  e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
  e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -289,18 +289,18 @@ e_xcbc_d.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
  e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-e_xcbc_d.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_xcbc_d.o: ../../include/openssl/types.h ../cryptlib.h e_xcbc_d.c
+e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+e_xcbc_d.o: ../../include/openssl/symhacks.h ../cryptlib.h e_xcbc_d.c
  encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  encode.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  encode.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  encode.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  encode.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  encode.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-encode.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-encode.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-encode.o: ../../include/openssl/types.h ../cryptlib.h encode.c
+encode.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+encode.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+encode.o: ../../include/openssl/symhacks.h ../cryptlib.h encode.c
  evp_enc.o: ../../e_os.h ../../include/openssl/asn1.h
  evp_enc.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  evp_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -309,10 +309,10 @@ evp_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  evp_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  evp_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  evp_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-evp_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_enc.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_enc.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+evp_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h
  evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -320,8 +320,8 @@ evp_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  evp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  evp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-evp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+evp_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+evp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  evp_err.o: evp_err.c
  evp_key.o: ../../e_os.h ../../include/openssl/asn1.h
  evp_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -331,10 +331,10 @@ evp_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  evp_key.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_key.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+evp_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+evp_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  evp_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  evp_key.o: ../cryptlib.h evp_key.c
  evp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -344,8 +344,8 @@ evp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  evp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  evp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  evp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-evp_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+evp_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+evp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  evp_lib.o: ../cryptlib.h evp_lib.c
  evp_pbe.o: ../../e_os.h ../../include/openssl/asn1.h
  evp_pbe.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -355,10 +355,10 @@ evp_pbe.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_pbe.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+evp_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c
  evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -368,11 +368,11 @@ evp_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  evp_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  evp_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  evp_pkey.o: ../../include/openssl/opensslconf.h
-evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-evp_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_pkey.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+evp_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  evp_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pkey.c
  m_dss.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_dss.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -381,10 +381,10 @@ m_dss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  m_dss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_dss.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  m_dss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_dss.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_dss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_dss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_dss.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_dss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_dss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_dss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_dss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_dss.o: ../cryptlib.h m_dss.c
  m_dss1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -394,10 +394,10 @@ m_dss1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  m_dss1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_dss1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  m_dss1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_dss1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_dss1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_dss1.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_dss1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_dss1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_dss1.o: ../cryptlib.h m_dss1.c
  m_md2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -408,10 +408,10 @@ m_md2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  m_md2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  m_md2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-m_md2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md2.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+m_md2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+m_md2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  m_md2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md2.c
  m_md4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_md4.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -421,10 +421,10 @@ m_md4.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_md4.o: ../../include/openssl/lhash.h ../../include/openssl/md4.h
  m_md4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  m_md4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-m_md4.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-m_md4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md4.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md4.c
  m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_md5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -434,10 +434,10 @@ m_md5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_md5.o: ../../include/openssl/lhash.h ../../include/openssl/md5.h
  m_md5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-m_md5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md5.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
  m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_mdc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -447,10 +447,10 @@ m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  m_mdc2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
  m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_mdc2.o: ../cryptlib.h m_mdc2.c
  m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -460,10 +460,10 @@ m_null.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  m_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_null.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_null.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_null.o: ../cryptlib.h m_null.c
  m_ripemd.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -474,11 +474,11 @@ m_ripemd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  m_ripemd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  m_ripemd.o: ../../include/openssl/opensslconf.h
-m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_ripemd.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_ripemd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_ripemd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_ripemd.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h
+m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_ripemd.c
  m_sha.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_sha.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -487,10 +487,10 @@ m_sha.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  m_sha.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_sha.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_sha.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_sha.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_sha.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_sha.o: ../cryptlib.h m_sha.c
  m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -500,10 +500,10 @@ m_sha1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  m_sha1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  m_sha1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  m_sha1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_sha1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_sha1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_sha1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_sha1.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+m_sha1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+m_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  m_sha1.o: ../cryptlib.h m_sha1.c
  names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -513,10 +513,10 @@ names.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  names.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-names.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-names.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-names.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+names.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+names.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  names.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  names.o: ../cryptlib.h names.c
  p5_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -527,10 +527,10 @@ p5_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p5_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p5_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_crpt.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p5_crpt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+p5_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p5_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt.c
  p5_crpt2.o: ../../e_os.h ../../include/openssl/asn1.h
  p5_crpt2.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -540,10 +540,10 @@ p5_crpt2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p5_crpt2.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
  p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p5_crpt2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p5_crpt2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p5_crpt2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p5_crpt2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p5_crpt2.o: ../cryptlib.h p5_crpt2.c
  p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -553,11 +553,11 @@ p_dec.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_dec.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_dec.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-p_dec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_dec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p_dec.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_dec.c
  p_enc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_enc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -566,11 +566,11 @@ p_enc.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_enc.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-p_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p_enc.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_enc.c
  p_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  p_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
@@ -580,10 +580,10 @@ p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p_lib.o: ../cryptlib.h p_lib.c
  p_open.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -593,10 +593,10 @@ p_open.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_open.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_open.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_open.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_open.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_open.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p_open.o: ../cryptlib.h p_open.c
  p_seal.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -606,11 +606,11 @@ p_seal.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_seal.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-p_seal.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_seal.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p_seal.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_seal.c
  p_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -619,10 +619,10 @@ p_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p_sign.o: ../cryptlib.h p_sign.c
  p_verify.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -633,9 +633,9 @@ p_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p_verify.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p_verify.o: ../../include/openssl/opensslconf.h
-p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p_verify.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_verify.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p_verify.o: ../cryptlib.h p_verify.c
diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl

index a4051b829fb5e99286bc1ede542fd7fccc5d2496..e6cf1a08796e1ccbc926c5398634399bf98dccaa 100644 (file)
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@@ -84,6 +84,6 @@ hmac.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
  hmac.o: ../../include/openssl/hmac.h ../../include/openssl/obj_mac.h
  hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-hmac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hmac.o: ../../include/openssl/types.h hmac.c
+hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hmac.o: ../../include/openssl/symhacks.h hmac.c
diff --git a/crypto/krb5/Makefile.ssl b/crypto/krb5/Makefile.ssl

index d1fc9584d1b900b9286c90b72645012fee92f994..6dd4449e1e76ba9078a467d1bb64414cae5185d7 100644 (file)
--- a/crypto/krb5/Makefile.ssl
+++ b/crypto/krb5/Makefile.ssl
@@ -85,6 +85,6 @@ krb5_asn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  krb5_asn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  krb5_asn.o: ../../include/openssl/krb5_asn.h
  krb5_asn.o: ../../include/openssl/opensslconf.h
-krb5_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-krb5_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-krb5_asn.o: ../../include/openssl/types.h krb5_asn.c
+krb5_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+krb5_asn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+krb5_asn.o: ../../include/openssl/symhacks.h krb5_asn.c
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl

index a1d81e0a6a652e57cb1d1e251e11811dbca48711..efe71eeb35d4821b9d81986bac63cc18262d12e3 100644 (file)
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -92,8 +92,8 @@ o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h
  o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-o_names.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  o_names.o: o_names.c
  obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h
  obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -101,23 +101,23 @@ obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-obj_dat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-obj_dat.o: ../../include/openssl/types.h ../cryptlib.h obj_dat.c obj_dat.h
+obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h
  obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  obj_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  obj_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-obj_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-obj_err.o: ../../include/openssl/types.h obj_err.c
+obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_err.o: ../../include/openssl/symhacks.h obj_err.c
  obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  obj_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  obj_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  obj_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-obj_lib.o: ../../include/openssl/types.h ../cryptlib.h obj_lib.c
+obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+obj_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_lib.c
diff --git a/crypto/ocsp/Makefile.ssl b/crypto/ocsp/Makefile.ssl

index 2841d4a13085ad37a0eeff3185aa297c90ac06bc..b69abdc1c74c985bffc8e769714853eac750a30e 100644 (file)
--- a/crypto/ocsp/Makefile.ssl
+++ b/crypto/ocsp/Makefile.ssl
@@ -90,10 +90,10 @@ ocsp_asn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_asn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ocsp_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_asn.o: ../../include/openssl/x509v3.h ocsp_asn.c
  ocsp_cl.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -105,11 +105,11 @@ ocsp_cl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-ocsp_cl.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-ocsp_cl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-ocsp_cl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+ocsp_cl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_cl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_cl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_cl.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_cl.c
  ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -120,10 +120,10 @@ ocsp_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ocsp_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_err.o: ../../include/openssl/x509v3.h ocsp_err.c
  ocsp_ext.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -135,11 +135,11 @@ ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  ocsp_ext.o: ../../include/openssl/opensslconf.h
-ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_ext.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ocsp_ext.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+ocsp_ext.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ocsp_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ocsp_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  ocsp_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  ocsp_ext.o: ../cryptlib.h ocsp_ext.c
  ocsp_ht.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -150,10 +150,10 @@ ocsp_ht.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  ocsp_ht.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  ocsp_ht.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  ocsp_ht.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_ht.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_ht.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_ht.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_ht.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c
  ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -165,12 +165,12 @@ ocsp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  ocsp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  ocsp_lib.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  ocsp_lib.o: ../../include/openssl/opensslconf.h
-ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-ocsp_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-ocsp_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ocsp_lib.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+ocsp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ocsp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ocsp_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  ocsp_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  ocsp_lib.o: ../cryptlib.h ocsp_lib.c
  ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -181,11 +181,11 @@ ocsp_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-ocsp_prn.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-ocsp_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ocsp_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_prn.o: ../../include/openssl/x509v3.h ocsp_prn.c
  ocsp_srv.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -197,12 +197,12 @@ ocsp_srv.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  ocsp_srv.o: ../../include/openssl/opensslconf.h
-ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-ocsp_srv.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-ocsp_srv.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ocsp_srv.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+ocsp_srv.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ocsp_srv.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ocsp_srv.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  ocsp_srv.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  ocsp_srv.o: ../cryptlib.h ocsp_srv.c
  ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -213,9 +213,9 @@ ocsp_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_vfy.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ocsp_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_vfy.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  ocsp_vfy.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  ocsp_vfy.o: ../../include/openssl/x509v3.h ocsp_vfy.c
diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl

index 09f6c57bc44dc85f31eccd32b8a352534b714ba1..c3f21b0d47a12093fc3d814a57bf39dec3b2f021 100644 (file)
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -90,11 +90,11 @@ pem_all.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_all.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pem_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+pem_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_all.c
  pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pem_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -103,11 +103,11 @@ pem_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_err.o: pem_err.c
  pem_info.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -118,11 +118,11 @@ pem_info.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_info.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_info.o: ../../include/openssl/opensslconf.h
-pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_info.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_info.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_info.o: ../cryptlib.h pem_info.c
  pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -133,12 +133,12 @@ pem_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
-pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-pem_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_lib.o: ../cryptlib.h pem_lib.c
  pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -149,11 +149,11 @@ pem_oth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_oth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_oth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-pem_oth.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_oth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-pem_oth.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_oth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_oth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+pem_oth.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+pem_oth.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_oth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_oth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_oth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_oth.o: ../cryptlib.h pem_oth.c
  pem_pk8.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -164,12 +164,12 @@ pem_pk8.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_pk8.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_pk8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-pem_pk8.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_pk8.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_pk8.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pem_pk8.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_pk8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_pk8.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pem_pk8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+pem_pk8.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
+pem_pk8.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_pk8.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_pk8.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_pk8.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pem_pk8.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_pk8.c
  pem_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
  pem_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -179,12 +179,12 @@ pem_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_pkey.o: ../../include/openssl/opensslconf.h
-pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_pkey.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
-pem_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-pem_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_pkey.o: ../cryptlib.h pem_pkey.c
  pem_seal.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -195,12 +195,12 @@ pem_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_seal.o: ../../include/openssl/opensslconf.h
-pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_seal.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_seal.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pem_seal.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_seal.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_seal.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c
  pem_sign.o: ../../e_os.h ../../include/openssl/asn1.h
  pem_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -210,12 +210,12 @@ pem_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_sign.o: ../../include/openssl/opensslconf.h
-pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_sign.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_sign.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pem_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_sign.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pem_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_sign.c
  pem_x509.o: ../../e_os.h ../../include/openssl/asn1.h
  pem_x509.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -225,11 +225,11 @@ pem_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_x509.o: ../../include/openssl/opensslconf.h
-pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_x509.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_x509.o: ../cryptlib.h pem_x509.c
  pem_xaux.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -240,10 +240,10 @@ pem_xaux.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pem_xaux.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pem_xaux.o: ../../include/openssl/opensslconf.h
-pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_xaux.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_xaux.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_xaux.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_xaux.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_xaux.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_xaux.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pem_xaux.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pem_xaux.o: ../cryptlib.h pem_xaux.c
diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl

index 312c00395ecf9c4d42caba41f038f05f773aaef9..cb815db72f04a1c8b541bad78b10f4679e0c6966 100644 (file)
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@@ -93,10 +93,10 @@ p12_add.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_add.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_add.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_add.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_add.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_add.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_add.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_add.o: ../cryptlib.h p12_add.c
  p12_asn.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -107,11 +107,11 @@ p12_asn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p12_asn.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p12_asn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p12_asn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_asn.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_asn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_asn.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_asn.c
  p12_attr.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_attr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -121,11 +121,11 @@ p12_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_attr.o: ../../include/openssl/opensslconf.h
-p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_attr.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_attr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_attr.c
  p12_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_crpt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -135,11 +135,11 @@ p12_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_crpt.o: ../../include/openssl/opensslconf.h
-p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_crpt.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crpt.c
  p12_crt.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_crt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -149,10 +149,10 @@ p12_crt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_crt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_crt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_crt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_crt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_crt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_crt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_crt.o: ../cryptlib.h p12_crt.c
  p12_decr.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -163,11 +163,11 @@ p12_decr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_decr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_decr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_decr.o: ../../include/openssl/opensslconf.h
-p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_decr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_decr.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_decr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_decr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_decr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_decr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_decr.c
  p12_init.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_init.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -177,11 +177,11 @@ p12_init.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_init.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_init.o: ../../include/openssl/opensslconf.h
-p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_init.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_init.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_init.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_init.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_init.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_init.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_init.c
  p12_key.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -191,10 +191,10 @@ p12_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_key.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_key.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_key.o: ../cryptlib.h p12_key.c
  p12_kiss.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -205,11 +205,11 @@ p12_kiss.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_kiss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_kiss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_kiss.o: ../../include/openssl/opensslconf.h
-p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_kiss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_kiss.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_kiss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_kiss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_kiss.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_kiss.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_kiss.c
  p12_mutl.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_mutl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -219,11 +219,11 @@ p12_mutl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_mutl.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
  p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_mutl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-p12_mutl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+p12_mutl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_mutl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_mutl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_mutl.o: ../cryptlib.h p12_mutl.c
  p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -233,12 +233,12 @@ p12_npas.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-p12_npas.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
-p12_npas.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-p12_npas.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_npas.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_npas.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p12_npas.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+p12_npas.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_npas.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_npas.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_npas.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  p12_npas.o: ../../include/openssl/x509_vfy.h p12_npas.c
  p12_p8d.o: ../../e_os.h ../../include/openssl/asn1.h
  p12_p8d.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -248,10 +248,10 @@ p12_p8d.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_p8d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_p8d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_p8d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_p8d.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_p8d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_p8d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_p8d.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_p8d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_p8d.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_p8d.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_p8d.o: ../cryptlib.h p12_p8d.c
  p12_p8e.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -262,10 +262,10 @@ p12_p8e.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_p8e.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_p8e.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_p8e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_p8e.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_p8e.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_p8e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_p8e.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_p8e.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_p8e.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_p8e.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_p8e.o: ../cryptlib.h p12_p8e.c
  p12_utl.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -276,10 +276,10 @@ p12_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_utl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_utl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
+p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+p12_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  p12_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_utl.o: ../cryptlib.h p12_utl.c
  pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -289,9 +289,9 @@ pk12err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-pk12err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk12err.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+pk12err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk12err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk12err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pk12err.o: ../../include/openssl/x509_vfy.h pk12err.c
diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl

index 49fc1840880c1759ac6eeab322cc9e635dc97434..f606abe440b1bf38566c8a79a4e406dc0a5daef2 100644 (file)
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -108,10 +108,10 @@ pk7_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pk7_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pk7_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pk7_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pk7_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pk7_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pk7_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pk7_asn1.o: ../cryptlib.h pk7_asn1.c
  pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -121,11 +121,11 @@ pk7_attr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pk7_attr.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pk7_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pk7_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pk7_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pk7_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pk7_attr.o: pk7_attr.c
  pk7_doit.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -136,11 +136,11 @@ pk7_doit.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pk7_doit.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_doit.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pk7_doit.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_doit.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_doit.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pk7_doit.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  pk7_doit.o: ../cryptlib.h pk7_doit.c
  pk7_lib.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -151,10 +151,10 @@ pk7_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-pk7_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_lib.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pk7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_lib.c
  pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h
  pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -164,11 +164,11 @@ pk7_mime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  pk7_mime.o: ../../include/openssl/opensslconf.h
-pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pk7_mime.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_mime.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pk7_mime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_mime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_mime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  pk7_mime.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_mime.c
  pk7_smime.o: ../../e_os.h ../../include/openssl/asn1.h
  pk7_smime.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -179,17 +179,17 @@ pk7_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  pk7_smime.o: ../../include/openssl/objects.h
  pk7_smime.o: ../../include/openssl/opensslconf.h
-pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pk7_smime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pk7_smime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pk7_smime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pk7_smime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pk7_smime.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_smime.c
  pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pkcs7err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  pkcs7err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  pkcs7err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pkcs7err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-pkcs7err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  pkcs7err.o: pkcs7err.c
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl

index e86995834455df544c7f10deaa4e9dfd3ca7f2ea..ccf65f0d78a1c08f01873cf9eeaac52005339984 100644 (file)
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -87,19 +87,19 @@ md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  md_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-md_rand.o: ../../include/openssl/types.h md_rand.c rand_lcl.h
+md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+md_rand.o: ../../include/openssl/symhacks.h md_rand.c rand_lcl.h
  rand_egd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-rand_egd.o: ../../include/openssl/rand.h ../../include/openssl/types.h
+rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
  rand_egd.o: rand_egd.c
  rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
  rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rand_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rand_err.o: rand_err.c
  rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -108,10 +108,10 @@ rand_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  rand_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  rand_lib.o: ../../include/openssl/opensslconf.h
-rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_lib.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rand_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  rand_lib.o: ../cryptlib.h rand_lib.c
  rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h
  rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -120,10 +120,11 @@ rand_os2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rand_os2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  rand_os2.o: ../../include/openssl/opensslconf.h
-rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_os2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rand_os2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_os2.o: ../../include/openssl/types.h ../cryptlib.h rand_lcl.h rand_os2.c
+rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_os2.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
+rand_os2.o: rand_os2.c
  rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h
  rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -131,10 +132,11 @@ rand_unix.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rand_unix.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  rand_unix.o: ../../include/openssl/opensslconf.h
-rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_unix.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rand_unix.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_unix.o: ../../include/openssl/types.h ../cryptlib.h rand_lcl.h rand_unix.c
+rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+rand_unix.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_unix.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
+rand_unix.o: rand_unix.c
  rand_win.o: ../../e_os.h ../../include/openssl/asn1.h
  rand_win.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rand_win.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -142,13 +144,14 @@ rand_win.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rand_win.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  rand_win.o: ../../include/openssl/opensslconf.h
-rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rand_win.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_win.o: ../../include/openssl/types.h ../cryptlib.h rand_lcl.h rand_win.c
+rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_win.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
+rand_win.o: rand_win.c
  randfile.o: ../../e_os.h ../../include/openssl/crypto.h
  randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-randfile.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-randfile.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+randfile.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+randfile.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  randfile.o: randfile.c
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl

index b56a003a5f7b72be4fada262e453d42b7c32da42..f1e93c2fa3881e67ed4b106256154ff15026057b 100644 (file)
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -89,17 +89,17 @@ rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
  rsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  rsa_asn1.o: ../../include/openssl/opensslconf.h
-rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_asn1.o: ../cryptlib.h rsa_asn1.c
  rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  rsa_chk.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_chk.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_chk.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_chk.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_chk.o: rsa_chk.c
  rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -108,26 +108,26 @@ rsa_eay.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rsa_eay.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  rsa_eay.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  rsa_eay.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_eay.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_eay.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_eay.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_eay.o: ../../include/openssl/ui.h ../cryptlib.h rsa_eay.c
  rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
  rsa_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_err.o: rsa_err.c
  rsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_gen.o: ../cryptlib.h rsa_gen.c
  rsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -136,28 +136,28 @@ rsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-rsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_lib.o: ../../include/openssl/ui.h ../cryptlib.h rsa_lib.c
  rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_none.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_none.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_none.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_none.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_none.o: ../../include/openssl/types.h ../cryptlib.h rsa_none.c
+rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_none.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_none.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_none.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_none.c
  rsa_null.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_null.o: ../../include/openssl/types.h ../cryptlib.h rsa_null.c
+rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_null.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_null.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_null.c
  rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -165,20 +165,20 @@ rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_oaep.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  rsa_oaep.o: ../../include/openssl/opensslconf.h
-rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_oaep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_oaep.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rsa_oaep.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_oaep.o: ../cryptlib.h rsa_oaep.c
  rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_pk1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_pk1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_pk1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_pk1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_pk1.o: ../../include/openssl/types.h ../cryptlib.h rsa_pk1.c
+rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c
  rsa_saos.o: ../../e_os.h ../../include/openssl/asn1.h
  rsa_saos.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -187,10 +187,10 @@ rsa_saos.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_saos.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  rsa_saos.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  rsa_saos.o: ../../include/openssl/opensslconf.h
-rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-rsa_saos.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_saos.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rsa_saos.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_saos.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+rsa_saos.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+rsa_saos.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  rsa_saos.o: ../cryptlib.h rsa_saos.c
  rsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -201,11 +201,11 @@ rsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
  rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-rsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_sign.o: ../../include/openssl/types.h ../../include/openssl/ui.h
+rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+rsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rsa_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
  rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  rsa_sign.o: ../cryptlib.h rsa_sign.c
  rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -213,7 +213,7 @@ rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_ssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  rsa_ssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_ssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_ssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_ssl.o: ../../include/openssl/types.h ../cryptlib.h rsa_ssl.c
+rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_ssl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_ssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_ssl.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_ssl.c
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl

index d69b8ffb686918a222cac291096e91d127f3e86e..3063f448c06d6c95123b565159dc29646d92f3a9 100644 (file)
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@@ -96,10 +96,10 @@ by_dir.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  by_dir.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  by_dir.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  by_dir.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-by_dir.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-by_dir.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-by_dir.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+by_dir.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+by_dir.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  by_dir.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  by_dir.o: ../cryptlib.h by_dir.c
  by_file.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -110,11 +110,11 @@ by_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  by_file.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  by_file.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-by_file.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-by_file.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-by_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-by_file.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+by_file.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+by_file.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+by_file.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+by_file.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+by_file.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  by_file.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_file.c
  x509_att.o: ../../e_os.h ../../include/openssl/asn1.h
  x509_att.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -124,10 +124,10 @@ x509_att.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_att.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_att.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_att.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_att.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_att.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_att.c
  x509_cmp.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -138,10 +138,10 @@ x509_cmp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_cmp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_cmp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_cmp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_cmp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_cmp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_cmp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_cmp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_cmp.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_cmp.c
  x509_d2.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -152,10 +152,10 @@ x509_d2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_d2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x509_d2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x509_d2.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+x509_d2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+x509_d2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x509_d2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x509_d2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  x509_d2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_d2.c
  x509_def.o: ../../e_os.h ../../include/openssl/asn1.h
  x509_def.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -165,10 +165,10 @@ x509_def.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_def.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_def.o: ../../include/openssl/opensslconf.h
-x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_def.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_def.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_def.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_def.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_def.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_def.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_def.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_def.o: ../cryptlib.h x509_def.c
  x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -178,10 +178,10 @@ x509_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_err.o: x509_err.c
  x509_ext.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -192,10 +192,10 @@ x509_ext.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_ext.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_ext.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_ext.c
  x509_lu.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -206,10 +206,10 @@ x509_lu.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_lu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_lu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_lu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_lu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_lu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_lu.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_lu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_lu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_lu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_lu.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_lu.c
  x509_obj.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -220,10 +220,10 @@ x509_obj.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_obj.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_obj.o: ../../include/openssl/opensslconf.h
-x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_obj.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_obj.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_obj.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_obj.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_obj.o: ../cryptlib.h x509_obj.c
  x509_r2x.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -234,10 +234,10 @@ x509_r2x.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_r2x.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_r2x.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_r2x.o: ../../include/openssl/opensslconf.h
-x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_r2x.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_r2x.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_r2x.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_r2x.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_r2x.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_r2x.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_r2x.o: ../cryptlib.h x509_r2x.c
  x509_req.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -248,11 +248,11 @@ x509_req.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_req.o: ../../include/openssl/opensslconf.h
-x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-x509_req.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-x509_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_req.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_req.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+x509_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_req.o: ../cryptlib.h x509_req.c
  x509_set.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -263,10 +263,10 @@ x509_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_set.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_set.o: ../../include/openssl/opensslconf.h
-x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_set.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_set.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_set.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_set.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_set.o: ../cryptlib.h x509_set.c
  x509_trs.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -277,10 +277,10 @@ x509_trs.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_trs.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_trs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_trs.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_trs.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_trs.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_trs.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_trs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_trs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_trs.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_trs.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_trs.c
  x509_txt.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -291,10 +291,10 @@ x509_txt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509_txt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509_txt.o: ../../include/openssl/opensslconf.h
-x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_txt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_txt.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_txt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_txt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_txt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_txt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_txt.o: ../cryptlib.h x509_txt.c
  x509_v3.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -305,10 +305,10 @@ x509_v3.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_v3.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_v3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_v3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_v3.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_v3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_v3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_v3.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_v3.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_v3.c
  x509_vfy.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -319,10 +319,10 @@ x509_vfy.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x509_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x509_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x509_vfy.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_vfy.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_vfy.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509_vfy.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_vfy.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_vfy.c
  x509cset.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -333,10 +333,10 @@ x509cset.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509cset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509cset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509cset.o: ../../include/openssl/opensslconf.h
-x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509cset.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509cset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509cset.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509cset.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509cset.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509cset.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509cset.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509cset.o: ../cryptlib.h x509cset.c
  x509name.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -347,10 +347,10 @@ x509name.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509name.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509name.o: ../../include/openssl/opensslconf.h
-x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509name.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509name.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509name.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509name.o: ../cryptlib.h x509name.c
  x509rset.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -361,10 +361,10 @@ x509rset.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509rset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509rset.o: ../../include/openssl/opensslconf.h
-x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509rset.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509rset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509rset.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509rset.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509rset.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509rset.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509rset.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509rset.o: ../cryptlib.h x509rset.c
  x509spki.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -375,10 +375,10 @@ x509spki.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509spki.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509spki.o: ../../include/openssl/opensslconf.h
-x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509spki.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509spki.o: ../cryptlib.h x509spki.c
  x509type.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -389,10 +389,10 @@ x509type.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509type.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  x509type.o: ../../include/openssl/opensslconf.h
-x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509type.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509type.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x509type.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x509type.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509type.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x509type.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509type.o: ../cryptlib.h x509type.c
  x_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -402,9 +402,9 @@ x_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  x_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  x_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  x_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+x_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+x_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+x_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  x_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x_all.o: ../cryptlib.h x_all.c
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl

index f4d7affd2cdd71bb116648a36501d7386412070d..da7c859476434cd8705a58e79601020aca94c24f 100644 (file)
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -94,10 +94,10 @@ v3_akey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_akey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_akey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_akey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_akey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_akey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_akey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_akey.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_akey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_akey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_akey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_akey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_akey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_akey.o: ../cryptlib.h v3_akey.c
  v3_akeya.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -109,10 +109,10 @@ v3_akeya.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_akeya.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_akeya.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_akeya.o: ../../include/openssl/opensslconf.h
-v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_akeya.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_akeya.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_akeya.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_akeya.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_akeya.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_akeya.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_akeya.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_akeya.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_akeya.c
  v3_alt.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -123,10 +123,10 @@ v3_alt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_alt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_alt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_alt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_alt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_alt.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_alt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_alt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_alt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_alt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_alt.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_alt.o: ../cryptlib.h v3_alt.c
  v3_bcons.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -138,10 +138,10 @@ v3_bcons.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_bcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_bcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_bcons.o: ../../include/openssl/opensslconf.h
-v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_bcons.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_bcons.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_bcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_bcons.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_bcons.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_bcons.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_bcons.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_bcons.c
  v3_bitst.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -152,10 +152,10 @@ v3_bitst.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  v3_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_bitst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_bitst.c
  v3_conf.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -166,10 +166,10 @@ v3_conf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  v3_conf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_conf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_conf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_conf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_conf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_conf.c
  v3_cpols.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -181,10 +181,10 @@ v3_cpols.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_cpols.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_cpols.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_cpols.o: ../../include/openssl/opensslconf.h
-v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_cpols.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_cpols.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_cpols.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_cpols.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_cpols.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_cpols.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_cpols.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_cpols.c
  v3_crld.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -196,10 +196,10 @@ v3_crld.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_crld.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_crld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_crld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_crld.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_crld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_crld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_crld.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_crld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_crld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_crld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_crld.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_crld.o: ../cryptlib.h v3_crld.c
  v3_enum.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -210,10 +210,10 @@ v3_enum.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  v3_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_enum.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_enum.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_enum.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_enum.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_enum.c
  v3_extku.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -225,10 +225,10 @@ v3_extku.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_extku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_extku.o: ../../include/openssl/opensslconf.h
-v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_extku.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_extku.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_extku.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_extku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_extku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_extku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_extku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_extku.c
  v3_genn.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -240,10 +240,10 @@ v3_genn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_genn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_genn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_genn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_genn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_genn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_genn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_genn.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_genn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_genn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_genn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_genn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_genn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_genn.o: ../cryptlib.h v3_genn.c
  v3_ia5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -254,10 +254,10 @@ v3_ia5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_ia5.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_ia5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_ia5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_ia5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_ia5.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_ia5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_ia5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_ia5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_ia5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_ia5.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_ia5.o: ../cryptlib.h v3_ia5.c
  v3_info.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -269,10 +269,10 @@ v3_info.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_info.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_info.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_info.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_info.o: ../cryptlib.h v3_info.c
  v3_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -283,10 +283,10 @@ v3_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_int.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_int.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_int.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_int.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_int.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_int.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_int.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_int.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_int.o: ../cryptlib.h v3_int.c
  v3_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -297,10 +297,10 @@ v3_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_lib.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_lib.o: ../cryptlib.h ext_dat.h v3_lib.c
  v3_ocsp.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -312,10 +312,10 @@ v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
  v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_ocsp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_ocsp.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_ocsp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_ocsp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_ocsp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_ocsp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_ocsp.o: ../cryptlib.h v3_ocsp.c
  v3_pku.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -327,10 +327,10 @@ v3_pku.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_pku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_pku.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_pku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_pku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_pku.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_pku.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_pku.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_pku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_pku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_pku.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_pku.o: ../cryptlib.h v3_pku.c
  v3_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -341,10 +341,10 @@ v3_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_prn.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_prn.o: ../cryptlib.h v3_prn.c
  v3_purp.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -355,10 +355,10 @@ v3_purp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  v3_purp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_purp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_purp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_purp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_purp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_purp.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_purp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_purp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_purp.c
  v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -369,10 +369,10 @@ v3_skey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  v3_skey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
  v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_skey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_skey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_skey.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_skey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_skey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_skey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_skey.c
  v3_sxnet.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -384,10 +384,10 @@ v3_sxnet.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_sxnet.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_sxnet.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_sxnet.o: ../../include/openssl/opensslconf.h
-v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-v3_sxnet.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-v3_sxnet.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+v3_sxnet.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+v3_sxnet.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+v3_sxnet.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
  v3_sxnet.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  v3_sxnet.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_sxnet.c
  v3_utl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -398,10 +398,10 @@ v3_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3_utl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_utl.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_utl.o: ../cryptlib.h v3_utl.c
  v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -412,9 +412,9 @@ v3err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  v3err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
  v3err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
  v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-v3err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3err.o: ../../include/openssl/types.h ../../include/openssl/x509.h
+v3err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+v3err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
  v3err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3err.o: v3err.c
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl

index aaad2e6a3a2619489bb954a9100a7476c1b8f206..d643b4252f14d48bab09ae4c70d14b6f6cf80035 100644 (file)
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -106,14 +106,14 @@ bio_ssl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  bio_ssl.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-bio_ssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-bio_ssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-bio_ssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-bio_ssl.o: ../include/openssl/types.h ../include/openssl/x509.h
+bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+bio_ssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+bio_ssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+bio_ssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+bio_ssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  bio_ssl.o: ../include/openssl/x509_vfy.h bio_ssl.c
  kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  kssl.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -123,14 +123,14 @@ kssl.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  kssl.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h
  kssl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  kssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-kssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-kssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-kssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-kssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-kssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-kssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-kssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-kssl.o: ../include/openssl/types.h ../include/openssl/x509.h
+kssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+kssl.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+kssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  kssl.o: ../include/openssl/x509_vfy.h kssl.c
  s23_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s23_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -140,14 +140,14 @@ s23_clnt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s23_clnt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s23_clnt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s23_clnt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s23_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s23_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s23_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s23_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s23_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s23_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s23_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s23_clnt.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s23_clnt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s23_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s23_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s23_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s23_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s23_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s23_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s23_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s23_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_clnt.c
  s23_clnt.o: ssl_locl.h
  s23_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -158,14 +158,14 @@ s23_lib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s23_lib.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s23_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s23_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s23_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s23_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s23_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s23_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s23_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s23_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s23_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s23_lib.o: ../include/openssl/types.h ../include/openssl/x509.h
+s23_lib.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s23_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s23_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s23_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s23_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s23_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s23_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s23_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s23_lib.o: ../include/openssl/x509_vfy.h s23_lib.c ssl_locl.h
  s23_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s23_meth.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -175,14 +175,14 @@ s23_meth.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s23_meth.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s23_meth.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s23_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s23_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s23_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s23_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s23_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s23_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s23_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s23_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s23_meth.o: ../include/openssl/types.h ../include/openssl/x509.h
+s23_meth.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s23_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s23_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s23_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s23_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s23_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s23_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s23_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s23_meth.o: ../include/openssl/x509_vfy.h s23_meth.c ssl_locl.h
  s23_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s23_pkt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -192,14 +192,14 @@ s23_pkt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s23_pkt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s23_pkt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s23_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s23_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s23_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s23_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s23_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s23_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s23_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s23_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s23_pkt.o: ../include/openssl/types.h ../include/openssl/x509.h
+s23_pkt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s23_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s23_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s23_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s23_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s23_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s23_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s23_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s23_pkt.o: ../include/openssl/x509_vfy.h s23_pkt.c ssl_locl.h
  s23_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s23_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -209,14 +209,14 @@ s23_srvr.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s23_srvr.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s23_srvr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s23_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s23_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s23_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s23_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s23_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s23_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s23_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s23_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s23_srvr.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s23_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s23_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s23_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s23_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s23_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s23_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s23_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s23_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s23_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_srvr.c
  s23_srvr.o: ssl_locl.h
  s2_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -227,14 +227,14 @@ s2_clnt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s2_clnt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_clnt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s2_clnt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s2_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s2_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s2_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s2_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_clnt.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s2_clnt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s2_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s2_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s2_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s2_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s2_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s2_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_clnt.c
  s2_clnt.o: ssl_locl.h
  s2_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -245,14 +245,14 @@ s2_enc.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s2_enc.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_enc.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s2_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s2_enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s2_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s2_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_enc.o: ../include/openssl/types.h ../include/openssl/x509.h
+s2_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s2_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s2_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s2_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s2_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s2_enc.o: ../include/openssl/x509_vfy.h s2_enc.c ssl_locl.h
  s2_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s2_lib.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -263,13 +263,13 @@ s2_lib.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_lib.o: ../include/openssl/lhash.h ../include/openssl/md5.h
  s2_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s2_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s2_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s2_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-s2_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_lib.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s2_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s2_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s2_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s2_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s2_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s2_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_lib.c
  s2_lib.o: ssl_locl.h
  s2_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -280,14 +280,14 @@ s2_meth.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s2_meth.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_meth.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s2_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s2_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s2_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s2_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_meth.o: ../include/openssl/types.h ../include/openssl/x509.h
+s2_meth.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s2_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s2_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s2_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s2_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s2_meth.o: ../include/openssl/x509_vfy.h s2_meth.c ssl_locl.h
  s2_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s2_pkt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -297,14 +297,14 @@ s2_pkt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s2_pkt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_pkt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s2_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s2_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s2_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s2_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_pkt.o: ../include/openssl/types.h ../include/openssl/x509.h
+s2_pkt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s2_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s2_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s2_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s2_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s2_pkt.o: ../include/openssl/x509_vfy.h s2_pkt.c ssl_locl.h
  s2_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s2_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -314,14 +314,14 @@ s2_srvr.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s2_srvr.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s2_srvr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s2_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s2_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s2_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s2_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s2_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_srvr.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s2_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s2_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s2_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s2_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s2_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s2_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s2_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_srvr.c
  s2_srvr.o: ssl_locl.h
  s3_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -332,14 +332,14 @@ s3_both.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s3_both.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_both.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s3_both.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_both.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s3_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s3_both.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s3_both.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_both.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s3_both.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s3_both.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s3_both.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s3_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_both.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s3_both.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_both.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_both.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s3_both.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_both.c
  s3_both.o: ssl_locl.h
  s3_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -351,14 +351,14 @@ s3_clnt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_clnt.o: ../include/openssl/lhash.h ../include/openssl/md5.h
  s3_clnt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s3_clnt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s3_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s3_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-s3_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_clnt.o: ../include/openssl/types.h ../include/openssl/x509.h
+s3_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s3_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s3_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+s3_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s3_clnt.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_clnt.c ssl_locl.h
  s3_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s3_enc.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -369,13 +369,13 @@ s3_enc.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_enc.o: ../include/openssl/lhash.h ../include/openssl/md5.h
  s3_enc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s3_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s3_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s3_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-s3_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_enc.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s3_enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s3_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s3_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s3_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s3_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_enc.c
  s3_enc.o: ssl_locl.h
  s3_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -387,13 +387,13 @@ s3_lib.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_lib.o: ../include/openssl/lhash.h ../include/openssl/md5.h
  s3_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  s3_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s3_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s3_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-s3_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_lib.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s3_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s3_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s3_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s3_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h
  s3_lib.o: s3_lib.c ssl_locl.h
  s3_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -404,14 +404,14 @@ s3_meth.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s3_meth.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_meth.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s3_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s3_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s3_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_meth.o: ../include/openssl/types.h ../include/openssl/x509.h
+s3_meth.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s3_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s3_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s3_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s3_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s3_meth.o: ../include/openssl/x509_vfy.h s3_meth.c ssl_locl.h
  s3_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s3_pkt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -421,14 +421,14 @@ s3_pkt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  s3_pkt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  s3_pkt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  s3_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_pkt.o: ../include/openssl/types.h ../include/openssl/x509.h
+s3_pkt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s3_pkt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s3_pkt.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+s3_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h
  s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -439,14 +439,14 @@ s3_srvr.o: ../include/openssl/evp.h ../include/openssl/krb5_asn.h
  s3_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  s3_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
  s3_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s3_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s3_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/types.h
+s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s3_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s3_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h
  s3_srvr.o: s3_srvr.c ssl_locl.h
  ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -457,14 +457,14 @@ ssl_algs.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_algs.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_algs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_algs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_algs.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_algs.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_algs.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_algs.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_algs.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_algs.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_algs.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_algs.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_algs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_algs.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_algs.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_algs.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_algs.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_algs.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_algs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_algs.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_algs.o: ../include/openssl/x509_vfy.h ssl_algs.c ssl_locl.h
  ssl_asn1.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/asn1_mac.h
  ssl_asn1.o: ../include/openssl/bio.h ../include/openssl/bn.h
@@ -475,13 +475,13 @@ ssl_asn1.o: ../include/openssl/err.h ../include/openssl/evp.h
  ssl_asn1.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ssl_asn1.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ssl_asn1.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ssl_asn1.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ssl_asn1.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-ssl_asn1.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_asn1.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_asn1.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_asn1.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_asn1.o: ../include/openssl/tls1.h ../include/openssl/types.h
+ssl_asn1.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ssl_asn1.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssl_asn1.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssl_asn1.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_asn1.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_asn1.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  ssl_asn1.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_asn1.c
  ssl_asn1.o: ssl_locl.h
  ssl_cert.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -493,13 +493,13 @@ ssl_cert.o: ../include/openssl/err.h ../include/openssl/evp.h
  ssl_cert.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ssl_cert.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ssl_cert.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ssl_cert.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ssl_cert.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-ssl_cert.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_cert.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_cert.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_cert.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_cert.o: ../include/openssl/tls1.h ../include/openssl/types.h
+ssl_cert.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ssl_cert.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssl_cert.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ssl_cert.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssl_cert.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_cert.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_cert.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  ssl_cert.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  ssl_cert.o: ../include/openssl/x509v3.h ssl_cert.c ssl_locl.h
  ssl_ciph.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -510,14 +510,14 @@ ssl_ciph.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_ciph.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_ciph.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_ciph.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_ciph.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_ciph.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_ciph.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_ciph.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_ciph.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_ciph.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_ciph.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_ciph.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_ciph.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_ciph.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_ciph.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_ciph.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_ciph.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_ciph.o: ../include/openssl/x509_vfy.h ssl_ciph.c ssl_locl.h
  ssl_err.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_err.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -527,14 +527,14 @@ ssl_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_err.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_err.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_err.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_err.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_err.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_err.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_err.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_err.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_err.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_err.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_err.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_err.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_err.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_err.o: ../include/openssl/x509_vfy.h ssl_err.c
  ssl_err2.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_err2.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -544,14 +544,14 @@ ssl_err2.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_err2.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_err2.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_err2.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_err2.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_err2.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_err2.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_err2.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_err2.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_err2.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_err2.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_err2.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_err2.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_err2.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_err2.o: ../include/openssl/x509_vfy.h ssl_err2.c
  ssl_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_lib.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -562,13 +562,13 @@ ssl_lib.o: ../include/openssl/err.h ../include/openssl/evp.h
  ssl_lib.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ssl_lib.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ssl_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ssl_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ssl_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
-ssl_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_lib.o: ../include/openssl/tls1.h ../include/openssl/types.h
+ssl_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ssl_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssl_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ssl_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssl_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  ssl_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  ssl_lib.o: ../include/openssl/x509v3.h kssl_lcl.h ssl_lib.c ssl_locl.h
  ssl_rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -579,14 +579,14 @@ ssl_rsa.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_rsa.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_rsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_rsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_rsa.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_rsa.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_rsa.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_rsa.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_rsa.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_rsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_rsa.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_rsa.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_rsa.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_rsa.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_rsa.c
  ssl_sess.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_sess.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -596,14 +596,14 @@ ssl_sess.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_sess.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_sess.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_sess.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_sess.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_sess.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_sess.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-ssl_sess.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_sess.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_sess.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_sess.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_sess.o: ../include/openssl/tls1.h ../include/openssl/types.h
+ssl_sess.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_sess.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_sess.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+ssl_sess.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ssl_sess.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssl_sess.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_sess.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_sess.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  ssl_sess.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
  ssl_sess.o: ssl_sess.c
  ssl_stat.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -614,14 +614,14 @@ ssl_stat.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_stat.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_stat.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_stat.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_stat.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_stat.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_stat.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_stat.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_stat.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_stat.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_stat.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_stat.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_stat.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_stat.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_stat.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_stat.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_stat.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_stat.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_stat.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_stat.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_stat.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_stat.c
  ssl_txt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_txt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -631,14 +631,14 @@ ssl_txt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  ssl_txt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  ssl_txt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  ssl_txt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_txt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_txt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_txt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_txt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_txt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_txt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_txt.o: ../include/openssl/types.h ../include/openssl/x509.h
+ssl_txt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ssl_txt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_txt.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+ssl_txt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_txt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_txt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_txt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_txt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  ssl_txt.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_txt.c
  t1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  t1_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -648,14 +648,14 @@ t1_clnt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  t1_clnt.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  t1_clnt.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  t1_clnt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-t1_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-t1_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-t1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-t1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-t1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-t1_clnt.o: ../include/openssl/tls1.h ../include/openssl/types.h
+t1_clnt.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+t1_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+t1_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+t1_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+t1_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+t1_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+t1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+t1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  t1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
  t1_clnt.o: t1_clnt.c
  t1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -667,14 +667,14 @@ t1_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h
  t1_enc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  t1_enc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
  t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-t1_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_enc.o: ../include/openssl/types.h ../include/openssl/x509.h
+t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  t1_enc.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_enc.c
  t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  t1_lib.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -684,14 +684,14 @@ t1_lib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  t1_lib.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  t1_lib.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  t1_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-t1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_lib.o: ../include/openssl/types.h ../include/openssl/x509.h
+t1_lib.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+t1_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+t1_lib.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+t1_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  t1_lib.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_lib.c
  t1_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  t1_meth.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -701,14 +701,14 @@ t1_meth.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  t1_meth.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  t1_meth.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  t1_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-t1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_meth.o: ../include/openssl/types.h ../include/openssl/x509.h
+t1_meth.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+t1_meth.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+t1_meth.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
+t1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
  t1_meth.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_meth.c
  t1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  t1_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -718,13 +718,13 @@ t1_srvr.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  t1_srvr.o: ../include/openssl/evp.h ../include/openssl/kssl.h
  t1_srvr.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  t1_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-t1_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-t1_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-t1_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-t1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-t1_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-t1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-t1_srvr.o: ../include/openssl/tls1.h ../include/openssl/types.h
+t1_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+t1_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+t1_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+t1_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+t1_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+t1_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+t1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+t1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
  t1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
  t1_srvr.o: t1_srvr.c
diff --git a/test/Makefile.ssl b/test/Makefile.ssl

index 4d599fc1373c0f4e9392fb225c2667e42113f027..1013b121a962d27553422366b50d1e909807bbb5 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -369,11 +369,11 @@ bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
  bntest.o: ../include/openssl/err.h ../include/openssl/evp.h
  bntest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  bntest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-bntest.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-bntest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-bntest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-bntest.o: ../include/openssl/types.h ../include/openssl/x509.h
+bntest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+bntest.o: ../include/openssl/sha.h ../include/openssl/stack.h
+bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
  bntest.o: ../include/openssl/x509_vfy.h bntest.c
  casttest.o: ../include/openssl/cast.h casttest.c
  destest.o: ../include/openssl/des.h ../include/openssl/e_os2.h
@@ -382,18 +382,18 @@ dhtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
  dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
  dhtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
  dhtest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-dhtest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-dhtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-dhtest.o: ../include/openssl/symhacks.h ../include/openssl/types.h dhtest.c
+dhtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+dhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
+dhtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dhtest.c
  dsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  dsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  dsatest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  dsatest.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
  dsatest.o: ../include/openssl/err.h ../include/openssl/lhash.h
  dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsatest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-dsatest.o: ../include/openssl/symhacks.h ../include/openssl/types.h
+dsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+dsatest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
  dsatest.o: ../include/openssl/ui.h dsatest.c
  ectest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ectest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
@@ -401,20 +401,21 @@ ectest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  ectest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
  ectest.o: ../include/openssl/engine.h ../include/openssl/err.h
  ectest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-ectest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-ectest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ectest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ectest.o: ../include/openssl/types.h ../include/openssl/ui.h ectest.c
+ectest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+ectest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+ectest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+ectest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h ectest.c
  enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  enginetest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
  enginetest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
  enginetest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
  enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h
  enginetest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-enginetest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-enginetest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-enginetest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-enginetest.o: ../include/openssl/types.h ../include/openssl/ui.h enginetest.c
+enginetest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+enginetest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+enginetest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+enginetest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+enginetest.o: enginetest.c
  evp_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  evp_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  evp_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h
@@ -422,25 +423,25 @@ evp_test.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
  evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h
  evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
  evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-evp_test.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-evp_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-evp_test.o: ../include/openssl/types.h ../include/openssl/ui.h evp_test.c
+evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+evp_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+evp_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+evp_test.o: ../include/openssl/symhacks.h ../include/openssl/ui.h evp_test.c
  exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
  exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
  exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
  exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-exptest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-exptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-exptest.o: ../include/openssl/types.h exptest.c
+exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+exptest.o: ../include/openssl/symhacks.h exptest.c
  hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  hmactest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  hmactest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  hmactest.o: ../include/openssl/hmac.h ../include/openssl/md5.h
  hmactest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-hmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-hmactest.o: ../include/openssl/symhacks.h ../include/openssl/types.h hmactest.c
+hmactest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h hmactest.c
  ideatest.o: ../include/openssl/idea.h ../include/openssl/opensslconf.h
  ideatest.o: ideatest.c
  md2test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -448,34 +449,34 @@ md2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  md2test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  md2test.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h
  md2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-md2test.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-md2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-md2test.o: ../include/openssl/types.h md2test.c
+md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+md2test.o: ../include/openssl/symhacks.h md2test.c
  md4test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  md4test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  md4test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  md4test.o: ../include/openssl/md4.h ../include/openssl/obj_mac.h
  md4test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-md4test.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-md4test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-md4test.o: ../include/openssl/types.h md4test.c
+md4test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+md4test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+md4test.o: ../include/openssl/symhacks.h md4test.c
  md5test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  md5test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  md5test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  md5test.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
  md5test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-md5test.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-md5test.o: ../include/openssl/types.h md5test.c
+md5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+md5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+md5test.o: ../include/openssl/symhacks.h md5test.c
  mdc2test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  mdc2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  mdc2test.o: ../include/openssl/des.h ../include/openssl/e_os2.h
  mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h
  mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-mdc2test.o: ../include/openssl/symhacks.h ../include/openssl/types.h mdc2test.c
-randtest.o: ../include/openssl/rand.h ../include/openssl/types.h randtest.c
+mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mdc2test.c
+randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h randtest.c
  rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
  rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h rc4test.c
  rc5test.o: ../include/openssl/rc5.h rc5test.c
@@ -484,35 +485,35 @@ rmdtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  rmdtest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  rmdtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  rmdtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-rmdtest.o: ../include/openssl/ripemd.h ../include/openssl/safestack.h
-rmdtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-rmdtest.o: ../include/openssl/types.h rmdtest.c
+rmdtest.o: ../include/openssl/ossl_typ.h ../include/openssl/ripemd.h
+rmdtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+rmdtest.o: ../include/openssl/symhacks.h rmdtest.c
  rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  rsa_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
  rsa_test.o: ../include/openssl/err.h ../include/openssl/lhash.h
  rsa_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-rsa_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-rsa_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-rsa_test.o: ../include/openssl/symhacks.h ../include/openssl/types.h
+rsa_test.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+rsa_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+rsa_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
  rsa_test.o: ../include/openssl/ui.h rsa_test.c
  sha1test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  sha1test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  sha1test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  sha1test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  sha1test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-sha1test.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-sha1test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-sha1test.o: ../include/openssl/types.h sha1test.c
+sha1test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+sha1test.o: ../include/openssl/sha.h ../include/openssl/stack.h
+sha1test.o: ../include/openssl/symhacks.h sha1test.c
  shatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  shatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
  shatest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
  shatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  shatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-shatest.o: ../include/openssl/types.h shatest.c
+shatest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h
+shatest.o: ../include/openssl/symhacks.h shatest.c
  ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
  ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
  ssltest.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -522,12 +523,12 @@ ssltest.o: ../include/openssl/err.h ../include/openssl/evp.h
  ssltest.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
  ssltest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
  ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ssltest.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ssltest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssltest.o: ../include/openssl/types.h ../include/openssl/ui.h
+ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssltest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssltest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssltest.o: ../include/openssl/tls1.h ../include/openssl/ui.h
  ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssltest.c
author	Richard Levitte <levitte@openssl.org>
	Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)
committer	Richard Levitte <levitte@openssl.org>
	Thu, 4 Oct 2001 07:49:09 +0000 (07:49 +0000)
apps/Makefile.ssl		patch \| blob \| history
crypto/asn1/Makefile.ssl		patch \| blob \| history
crypto/bio/Makefile.ssl		patch \| blob \| history
crypto/bn/Makefile.ssl		patch \| blob \| history
crypto/comp/Makefile.ssl		patch \| blob \| history
crypto/des/Makefile.ssl		patch \| blob \| history
crypto/dh/Makefile.ssl		patch \| blob \| history
crypto/dsa/Makefile.ssl		patch \| blob \| history
crypto/engine/Makefile.ssl		patch \| blob \| history
crypto/err/Makefile.ssl		patch \| blob \| history
crypto/evp/Makefile.ssl		patch \| blob \| history
crypto/hmac/Makefile.ssl		patch \| blob \| history
crypto/krb5/Makefile.ssl		patch \| blob \| history
crypto/objects/Makefile.ssl		patch \| blob \| history
crypto/ocsp/Makefile.ssl		patch \| blob \| history
crypto/pem/Makefile.ssl		patch \| blob \| history
crypto/pkcs12/Makefile.ssl		patch \| blob \| history
crypto/pkcs7/Makefile.ssl		patch \| blob \| history
crypto/rand/Makefile.ssl		patch \| blob \| history
crypto/rsa/Makefile.ssl		patch \| blob \| history
crypto/x509/Makefile.ssl		patch \| blob \| history
crypto/x509v3/Makefile.ssl		patch \| blob \| history
ssl/Makefile.ssl		patch \| blob \| history
test/Makefile.ssl		patch \| blob \| history