Merge of main trunk, no conflicts this time.

make update

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 89fd831a5101695e98a9debd27064e45356b5034..82d050e0ecd8b95bdc312de9cd2d11ee5ad6043c 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -206,14 +206,15 @@ ca.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 ca.o: ../include/openssl/des.h ../include/openssl/dh.h ../include/openssl/dsa.h
 ca.o: ../include/openssl/e_os.h ../include/openssl/e_os.h
-ca.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-ca.o: ../include/openssl/evp.h ../include/openssl/idea.h
-ca.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-ca.o: ../include/openssl/md4.h ../include/openssl/md5.h
-ca.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-ca.o: ../include/openssl/objects.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/e_os2.h ../include/openssl/engine.h
+ca.o: ../include/openssl/err.h ../include/openssl/evp.h
+ca.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+ca.o: ../include/openssl/md2.h ../include/openssl/md4.h
+ca.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ca.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 ca.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 ca.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 ca.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -289,14 +290,15 @@ dgst.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 dgst.o: ../include/openssl/crypto.h ../include/openssl/des.h
 dgst.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 dgst.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-dgst.o: ../include/openssl/err.h ../include/openssl/evp.h
-dgst.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-dgst.o: ../include/openssl/md2.h ../include/openssl/md4.h
-dgst.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+dgst.o: ../include/openssl/engine.h ../include/openssl/err.h
+dgst.o: ../include/openssl/evp.h ../include/openssl/idea.h
+dgst.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+dgst.o: ../include/openssl/md4.h ../include/openssl/md5.h
+dgst.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+dgst.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+dgst.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dgst.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 dgst.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 dgst.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -308,14 +310,15 @@ dh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 dh.o: ../include/openssl/crypto.h ../include/openssl/des.h
 dh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 dh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-dh.o: ../include/openssl/err.h ../include/openssl/evp.h
-dh.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-dh.o: ../include/openssl/md2.h ../include/openssl/md4.h
-dh.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+dh.o: ../include/openssl/engine.h ../include/openssl/err.h
+dh.o: ../include/openssl/evp.h ../include/openssl/idea.h
+dh.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+dh.o: ../include/openssl/md4.h ../include/openssl/md5.h
+dh.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+dh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+dh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dh.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 dh.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 dh.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -327,14 +330,15 @@ dsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 dsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 dsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 dsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-dsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-dsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-dsa.o: ../include/openssl/md2.h ../include/openssl/md4.h
-dsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+dsa.o: ../include/openssl/engine.h ../include/openssl/err.h
+dsa.o: ../include/openssl/evp.h ../include/openssl/idea.h
+dsa.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+dsa.o: ../include/openssl/md4.h ../include/openssl/md5.h
+dsa.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+dsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+dsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dsa.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 dsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 dsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -346,14 +350,15 @@ dsaparam.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 dsaparam.o: ../include/openssl/crypto.h ../include/openssl/des.h
 dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 dsaparam.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-dsaparam.o: ../include/openssl/err.h ../include/openssl/evp.h
-dsaparam.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-dsaparam.o: ../include/openssl/md2.h ../include/openssl/md4.h
-dsaparam.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h
+dsaparam.o: ../include/openssl/evp.h ../include/openssl/idea.h
+dsaparam.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+dsaparam.o: ../include/openssl/md4.h ../include/openssl/md5.h
+dsaparam.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+dsaparam.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+dsaparam.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 dsaparam.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 dsaparam.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -365,20 +370,20 @@ enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 enc.o: ../include/openssl/crypto.h ../include/openssl/des.h
 enc.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 enc.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-enc.o: ../include/openssl/err.h ../include/openssl/evp.h
-enc.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-enc.o: ../include/openssl/md2.h ../include/openssl/md4.h
-enc.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h ../include/openssl/rc4.h
-enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.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/x509.h
-enc.o: ../include/openssl/x509_vfy.h apps.h
+enc.o: ../include/openssl/engine.h ../include/openssl/err.h
+enc.o: ../include/openssl/evp.h ../include/openssl/idea.h
+enc.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+enc.o: ../include/openssl/md4.h ../include/openssl/md5.h
+enc.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+enc.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+enc.o: ../include/openssl/ripemd.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/x509.h ../include/openssl/x509_vfy.h apps.h
 errstr.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 errstr.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 errstr.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -407,34 +412,35 @@ gendh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 gendh.o: ../include/openssl/crypto.h ../include/openssl/des.h
 gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 gendh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-gendh.o: ../include/openssl/err.h ../include/openssl/evp.h
-gendh.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-gendh.o: ../include/openssl/md2.h ../include/openssl/md4.h
-gendh.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h ../include/openssl/rc4.h
-gendh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.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/x509.h
-gendh.o: ../include/openssl/x509_vfy.h apps.h
+gendh.o: ../include/openssl/engine.h ../include/openssl/err.h
+gendh.o: ../include/openssl/evp.h ../include/openssl/idea.h
+gendh.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+gendh.o: ../include/openssl/md4.h ../include/openssl/md5.h
+gendh.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+gendh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+gendh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+gendh.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+gendh.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+gendh.o: ../include/openssl/ripemd.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/x509.h ../include/openssl/x509_vfy.h apps.h
 gendsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 gendsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 gendsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 gendsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 gendsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 gendsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-gendsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-gendsa.o: ../include/openssl/md2.h ../include/openssl/md4.h
-gendsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+gendsa.o: ../include/openssl/engine.h ../include/openssl/err.h
+gendsa.o: ../include/openssl/evp.h ../include/openssl/idea.h
+gendsa.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+gendsa.o: ../include/openssl/md4.h ../include/openssl/md5.h
+gendsa.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+gendsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+gendsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+gendsa.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 gendsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 gendsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -528,14 +534,15 @@ pkcs12.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 pkcs12.o: ../include/openssl/crypto.h ../include/openssl/des.h
 pkcs12.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 pkcs12.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs12.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-pkcs12.o: ../include/openssl/md2.h ../include/openssl/md4.h
-pkcs12.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/engine.h ../include/openssl/err.h
+pkcs12.o: ../include/openssl/evp.h ../include/openssl/idea.h
+pkcs12.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+pkcs12.o: ../include/openssl/md4.h ../include/openssl/md5.h
+pkcs12.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+pkcs12.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+pkcs12.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
+pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 pkcs12.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 pkcs12.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 pkcs12.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -548,14 +555,15 @@ pkcs7.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 pkcs7.o: ../include/openssl/crypto.h ../include/openssl/des.h
 pkcs7.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 pkcs7.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs7.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-pkcs7.o: ../include/openssl/md2.h ../include/openssl/md4.h
-pkcs7.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+pkcs7.o: ../include/openssl/engine.h ../include/openssl/err.h
+pkcs7.o: ../include/openssl/evp.h ../include/openssl/idea.h
+pkcs7.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+pkcs7.o: ../include/openssl/md4.h ../include/openssl/md5.h
+pkcs7.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+pkcs7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+pkcs7.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+pkcs7.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 pkcs7.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 pkcs7.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -567,14 +575,15 @@ pkcs8.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 pkcs8.o: ../include/openssl/crypto.h ../include/openssl/des.h
 pkcs8.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 pkcs8.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs8.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-pkcs8.o: ../include/openssl/md2.h ../include/openssl/md4.h
-pkcs8.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/engine.h ../include/openssl/err.h
+pkcs8.o: ../include/openssl/evp.h ../include/openssl/idea.h
+pkcs8.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+pkcs8.o: ../include/openssl/md4.h ../include/openssl/md5.h
+pkcs8.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+pkcs8.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+pkcs8.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
+pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 pkcs8.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
 pkcs8.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
 pkcs8.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
@@ -587,19 +596,19 @@ rand.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 rand.o: ../include/openssl/crypto.h ../include/openssl/des.h
 rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 rand.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-rand.o: ../include/openssl/err.h ../include/openssl/evp.h
-rand.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-rand.o: ../include/openssl/md2.h ../include/openssl/md4.h
-rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h ../include/openssl/rc4.h
-rand.o: ../include/openssl/rc5.h ../include/openssl/ripemd.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/x509.h
-rand.o: ../include/openssl/x509_vfy.h apps.h
+rand.o: ../include/openssl/engine.h ../include/openssl/err.h
+rand.o: ../include/openssl/evp.h ../include/openssl/idea.h
+rand.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+rand.o: ../include/openssl/md4.h ../include/openssl/md5.h
+rand.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+rand.o: ../include/openssl/ripemd.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/x509.h ../include/openssl/x509_vfy.h apps.h
 req.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 req.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 req.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -628,14 +637,15 @@ rsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 rsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
 rsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 rsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-rsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-rsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-rsa.o: ../include/openssl/md2.h ../include/openssl/md4.h
-rsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+rsa.o: ../include/openssl/engine.h ../include/openssl/err.h
+rsa.o: ../include/openssl/evp.h ../include/openssl/idea.h
+rsa.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+rsa.o: ../include/openssl/md4.h ../include/openssl/md5.h
+rsa.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+rsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+rsa.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 rsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 rsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -647,14 +657,15 @@ rsautl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 rsautl.o: ../include/openssl/crypto.h ../include/openssl/des.h
 rsautl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 rsautl.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-rsautl.o: ../include/openssl/err.h ../include/openssl/evp.h
-rsautl.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-rsautl.o: ../include/openssl/md2.h ../include/openssl/md4.h
-rsautl.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+rsautl.o: ../include/openssl/engine.h ../include/openssl/err.h
+rsautl.o: ../include/openssl/evp.h ../include/openssl/idea.h
+rsautl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+rsautl.o: ../include/openssl/md4.h ../include/openssl/md5.h
+rsautl.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+rsautl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+rsautl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+rsautl.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 rsautl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 rsautl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 rsautl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -803,14 +814,15 @@ smime.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 smime.o: ../include/openssl/crypto.h ../include/openssl/des.h
 smime.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 smime.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-smime.o: ../include/openssl/err.h ../include/openssl/evp.h
-smime.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-smime.o: ../include/openssl/md2.h ../include/openssl/md4.h
-smime.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+smime.o: ../include/openssl/engine.h ../include/openssl/err.h
+smime.o: ../include/openssl/evp.h ../include/openssl/idea.h
+smime.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+smime.o: ../include/openssl/md4.h ../include/openssl/md5.h
+smime.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+smime.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+smime.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+smime.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 smime.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 smime.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -843,14 +855,15 @@ spkac.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 spkac.o: ../include/openssl/des.h ../include/openssl/dh.h
 spkac.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 spkac.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-spkac.o: ../include/openssl/err.h ../include/openssl/evp.h
-spkac.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-spkac.o: ../include/openssl/md2.h ../include/openssl/md4.h
-spkac.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+spkac.o: ../include/openssl/engine.h ../include/openssl/err.h
+spkac.o: ../include/openssl/evp.h ../include/openssl/idea.h
+spkac.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+spkac.o: ../include/openssl/md4.h ../include/openssl/md5.h
+spkac.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+spkac.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+spkac.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+spkac.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+spkac.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 spkac.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 spkac.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -863,14 +876,15 @@ verify.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 verify.o: ../include/openssl/des.h ../include/openssl/dh.h
 verify.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 verify.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-verify.o: ../include/openssl/err.h ../include/openssl/evp.h
-verify.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-verify.o: ../include/openssl/md2.h ../include/openssl/md4.h
-verify.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+verify.o: ../include/openssl/engine.h ../include/openssl/err.h
+verify.o: ../include/openssl/evp.h ../include/openssl/idea.h
+verify.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+verify.o: ../include/openssl/md4.h ../include/openssl/md5.h
+verify.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+verify.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+verify.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+verify.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+verify.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 verify.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 verify.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h
@@ -902,14 +916,15 @@ x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
 x509.o: ../include/openssl/des.h ../include/openssl/dh.h
 x509.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
 x509.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-x509.o: ../include/openssl/err.h ../include/openssl/evp.h
-x509.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-x509.o: ../include/openssl/md2.h ../include/openssl/md4.h
-x509.o: ../include/openssl/md5.h ../include/openssl/mdc2.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/rc2.h
+x509.o: ../include/openssl/engine.h ../include/openssl/err.h
+x509.o: ../include/openssl/evp.h ../include/openssl/idea.h
+x509.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+x509.o: ../include/openssl/md4.h ../include/openssl/md5.h
+x509.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+x509.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+x509.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+x509.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 x509.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 x509.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 x509.o: ../include/openssl/safestack.h ../include/openssl/sha.h

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 017ce2a9fce003b14f128e59e9a94b23a22599cd..cb8e17634f87f2ef163b4af049a80d4cbbfc9033 100644 (file)
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -236,7 +236,7 @@ int RAND_poll(void)
                if (cursor)
                        {
                        /* cursor position */
-                       cursor(buf);
+                       cursor((PCURSORINFO)buf);
                        RAND_add(buf, sizeof(buf), 0);
                        }
 

diff --git a/util/libeay.num b/util/libeay.num
index 13cae8fc5cb51e6d62855e7432cd3f879b6bc486..0465be4cff6a0870e8b24cbc06a953afc1060b9d 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1812,15 +1812,21 @@ d2i_RSA_NET                             2408    EXIST::FUNCTION:RSA
 DSO_bind_func                           2409   EXIST::FUNCTION:
 CRYPTO_get_new_dynlockid                2410   EXIST::FUNCTION:
 sk_new_null                             2411   EXIST::FUNCTION:
-CRYPTO_set_dynlock_destroy_callback     2412   EXIST::FUNCTION:
+CRYPTO_set_dynlock_destroy_callback     2412   EXIST:!VMS:FUNCTION:
+CRYPTO_set_dynlock_destroy_cb           2412   EXIST:VMS:FUNCTION:
 CRYPTO_destroy_dynlockid                2413   EXIST::FUNCTION:
 CRYPTO_set_dynlock_size                 2414   NOEXIST::FUNCTION:
-CRYPTO_set_dynlock_create_callback      2415   EXIST::FUNCTION:
-CRYPTO_set_dynlock_lock_callback        2416   EXIST::FUNCTION:
-CRYPTO_get_dynlock_lock_callback        2417   EXIST::FUNCTION:
-CRYPTO_get_dynlock_destroy_callback     2418   EXIST::FUNCTION:
+CRYPTO_set_dynlock_create_callback      2415   EXIST:!VMS:FUNCTION:
+CRYPTO_set_dynlock_create_cb            2415   EXIST:VMS:FUNCTION:
+CRYPTO_set_dynlock_lock_callback        2416   EXIST:!VMS:FUNCTION:
+CRYPTO_set_dynlock_lock_cb              2416   EXIST:VMS:FUNCTION:
+CRYPTO_get_dynlock_lock_callback        2417   EXIST:!VMS:FUNCTION:
+CRYPTO_get_dynlock_lock_cb              2417   EXIST:VMS:FUNCTION:
+CRYPTO_get_dynlock_destroy_callback     2418   EXIST:!VMS:FUNCTION:
+CRYPTO_get_dynlock_destroy_cb           2418   EXIST:VMS:FUNCTION:
 CRYPTO_get_dynlock_value                2419   EXIST::FUNCTION:
-CRYPTO_get_dynlock_create_callback      2420   EXIST::FUNCTION:
+CRYPTO_get_dynlock_create_callback      2420   EXIST:!VMS:FUNCTION:
+CRYPTO_get_dynlock_create_cb            2420   EXIST:VMS:FUNCTION:
 c2i_ASN1_BIT_STRING                     2421   EXIST::FUNCTION:
 i2c_ASN1_BIT_STRING                     2422   EXIST::FUNCTION:
 RAND_poll                               2423   EXIST::FUNCTION:
@@ -1860,59 +1866,61 @@ des_set_weak_key_flag                   2456    EXIST::VARIABLE:DES
 des_check_key                           2457   EXIST::VARIABLE:DES
 des_rw_mode                             2458   EXIST::VARIABLE:DES
 RSA_PKCS1_RSAref                        2459   EXIST:RSAREF:FUNCTION:RSA
-ERR_load_ENGINE_strings                 2460   EXIST::FUNCTION:
-ENGINE_set_DSA                          2461   EXIST::FUNCTION:
-ENGINE_get_finish_function              2462   EXIST::FUNCTION:
-ENGINE_get_default_RSA                  2463   EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp                   2464   EXIST::FUNCTION:
-DSA_get_default_openssl_method          2465   EXIST::FUNCTION:DSA
-ENGINE_set_DH                           2466   EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp_crt       2467   EXIST::FUNCTION:
-ENGINE_init                             2468   EXIST::FUNCTION:
-DH_get_default_openssl_method           2469   EXIST::FUNCTION:DH
-RSA_set_default_openssl_method          2470   EXIST::FUNCTION:RSA
-ENGINE_finish                           2471   EXIST::FUNCTION:
-ENGINE_load_public_key                  2472   EXIST::FUNCTION:
-ENGINE_get_DH                           2473   EXIST::FUNCTION:
-ENGINE_ctrl                             2474   EXIST::FUNCTION:
-ENGINE_get_init_function                2475   EXIST::FUNCTION:
-ENGINE_set_init_function                2476   EXIST::FUNCTION:
-ENGINE_set_default_DSA                  2477   EXIST::FUNCTION:
-ENGINE_get_name                         2478   EXIST::FUNCTION:
-ENGINE_get_last                         2479   EXIST::FUNCTION:
-ENGINE_get_prev                         2480   EXIST::FUNCTION:
-ENGINE_get_default_DH                   2481   EXIST::FUNCTION:
-ENGINE_get_RSA                          2482   EXIST::FUNCTION:
-ENGINE_set_default                      2483   EXIST::FUNCTION:
-ENGINE_get_RAND                         2484   EXIST::FUNCTION:
-ENGINE_get_first                        2485   EXIST::FUNCTION:
-ENGINE_by_id                            2486   EXIST::FUNCTION:
-ENGINE_set_finish_function              2487   EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp_crt       2488   EXIST::FUNCTION:
-RSA_get_default_openssl_method          2489   EXIST::FUNCTION:RSA
-ENGINE_set_RSA                          2490   EXIST::FUNCTION:
-ENGINE_load_private_key                 2491   EXIST::FUNCTION:
-ENGINE_set_default_RAND                 2492   EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp                   2493   EXIST::FUNCTION:
-ENGINE_remove                           2494   EXIST::FUNCTION:
-ENGINE_free                             2495   EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp_crt               2496   EXIST::FUNCTION:
-ENGINE_get_next                         2497   EXIST::FUNCTION:
-ENGINE_set_name                         2498   EXIST::FUNCTION:
-ENGINE_get_default_DSA                  2499   EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp           2500   EXIST::FUNCTION:
-ENGINE_set_default_RSA                  2501   EXIST::FUNCTION:
-ENGINE_get_default_RAND                 2502   EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp           2503   EXIST::FUNCTION:
-ENGINE_set_RAND                         2504   EXIST::FUNCTION:
-ENGINE_set_id                           2505   EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp_crt               2506   EXIST::FUNCTION:
-ENGINE_set_default_DH                   2507   EXIST::FUNCTION:
-ENGINE_new                              2508   EXIST::FUNCTION:
-ENGINE_get_id                           2509   EXIST::FUNCTION:
-DSA_set_default_openssl_method          2510   EXIST::FUNCTION:DSA
-ENGINE_add                              2511   EXIST::FUNCTION:
-DH_set_default_openssl_method           2512   EXIST::FUNCTION:DH
-ENGINE_get_DSA                          2513   EXIST::FUNCTION:
-ENGINE_get_ctrl_function                2514   EXIST::FUNCTION:
-ENGINE_set_ctrl_function                2515   EXIST::FUNCTION:
+X509_keyid_set1                         2460   EXIST::FUNCTION:
+BIO_next                                2461   EXIST::FUNCTION:
+ERR_load_ENGINE_strings                 2462   EXIST::FUNCTION:
+ENGINE_set_DSA                          2463   EXIST::FUNCTION:
+ENGINE_get_finish_function              2464   EXIST::FUNCTION:
+ENGINE_get_default_RSA                  2465   EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp                   2466   EXIST::FUNCTION:
+DSA_get_default_openssl_method          2467   EXIST::FUNCTION:DSA
+ENGINE_set_DH                           2468   EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2469   EXIST::FUNCTION:
+ENGINE_init                             2470   EXIST::FUNCTION:
+DH_get_default_openssl_method           2471   EXIST::FUNCTION:DH
+RSA_set_default_openssl_method          2472   EXIST::FUNCTION:RSA
+ENGINE_finish                           2473   EXIST::FUNCTION:
+ENGINE_load_public_key                  2474   EXIST::FUNCTION:
+ENGINE_get_DH                           2475   EXIST::FUNCTION:
+ENGINE_ctrl                             2476   EXIST::FUNCTION:
+ENGINE_get_init_function                2477   EXIST::FUNCTION:
+ENGINE_set_init_function                2478   EXIST::FUNCTION:
+ENGINE_set_default_DSA                  2479   EXIST::FUNCTION:
+ENGINE_get_name                         2480   EXIST::FUNCTION:
+ENGINE_get_last                         2481   EXIST::FUNCTION:
+ENGINE_get_prev                         2482   EXIST::FUNCTION:
+ENGINE_get_default_DH                   2483   EXIST::FUNCTION:
+ENGINE_get_RSA                          2484   EXIST::FUNCTION:
+ENGINE_set_default                      2485   EXIST::FUNCTION:
+ENGINE_get_RAND                         2486   EXIST::FUNCTION:
+ENGINE_get_first                        2487   EXIST::FUNCTION:
+ENGINE_by_id                            2488   EXIST::FUNCTION:
+ENGINE_set_finish_function              2489   EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2490   EXIST::FUNCTION:
+RSA_get_default_openssl_method          2491   EXIST::FUNCTION:RSA
+ENGINE_set_RSA                          2492   EXIST::FUNCTION:
+ENGINE_load_private_key                 2493   EXIST::FUNCTION:
+ENGINE_set_default_RAND                 2494   EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp                   2495   EXIST::FUNCTION:
+ENGINE_remove                           2496   EXIST::FUNCTION:
+ENGINE_free                             2497   EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp_crt               2498   EXIST::FUNCTION:
+ENGINE_get_next                         2499   EXIST::FUNCTION:
+ENGINE_set_name                         2500   EXIST::FUNCTION:
+ENGINE_get_default_DSA                  2501   EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp           2502   EXIST::FUNCTION:
+ENGINE_set_default_RSA                  2503   EXIST::FUNCTION:
+ENGINE_get_default_RAND                 2504   EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp           2505   EXIST::FUNCTION:
+ENGINE_set_RAND                         2506   EXIST::FUNCTION:
+ENGINE_set_id                           2507   EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp_crt               2508   EXIST::FUNCTION:
+ENGINE_set_default_DH                   2509   EXIST::FUNCTION:
+ENGINE_new                              2510   EXIST::FUNCTION:
+ENGINE_get_id                           2511   EXIST::FUNCTION:
+DSA_set_default_openssl_method          2512   EXIST::FUNCTION:DSA
+ENGINE_add                              2513   EXIST::FUNCTION:
+DH_set_default_openssl_method           2514   EXIST::FUNCTION:DH
+ENGINE_get_DSA                          2515   EXIST::FUNCTION:
+ENGINE_get_ctrl_function                2516   EXIST::FUNCTION:
+ENGINE_set_ctrl_function                2517   EXIST::FUNCTION:

diff --git a/util/ssleay.num b/util/ssleay.num
index 8dd5feece1e7b862691483417c4594f2872f94e0..561bac2ec9d69ba5a22a2c47a52b6827656cf558 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -11,7 +11,6 @@ SSL_CTX_get_verify_callback             10    EXIST::FUNCTION:
 SSL_CTX_get_verify_mode                 11     EXIST::FUNCTION:
 SSL_CTX_new                             12     EXIST::FUNCTION:
 SSL_CTX_remove_session                  13     EXIST::FUNCTION:
-SSL_CTX_set_cert_verify_cb              14     NOEXIST::FUNCTION:
 SSL_CTX_set_cipher_list                 15     EXIST::FUNCTION:
 SSL_CTX_set_client_CA_list              16     EXIST::FUNCTION:
 SSL_CTX_set_default_passwd_cb           17     EXIST::FUNCTION:
@@ -127,7 +126,8 @@ SSL_SESSION_set_timeout                 137 EXIST::FUNCTION:
 SSL_CTX_get_ex_data                     138    EXIST::FUNCTION:
 SSL_CTX_get_quiet_shutdown              140    EXIST::FUNCTION:
 SSL_CTX_load_verify_locations           141    EXIST::FUNCTION:
-SSL_CTX_set_default_verify_paths        142    EXIST::FUNCTION:
+SSL_CTX_set_default_verify_paths        142    EXIST:!VMS:FUNCTION:
+SSL_CTX_set_def_verify_paths            142    EXIST:VMS:FUNCTION:
 SSL_CTX_set_ex_data                     143    EXIST::FUNCTION:
 SSL_CTX_set_quiet_shutdown              145    EXIST::FUNCTION:
 SSL_SESSION_get_ex_data                 146    EXIST::FUNCTION:
@@ -154,7 +154,8 @@ TLSv1_server_method                     171 EXIST::FUNCTION:
 TLSv1_client_method                     172    EXIST::FUNCTION:
 BIO_new_buffer_ssl_connect              173    EXIST::FUNCTION:
 BIO_new_ssl_connect                     174    EXIST::FUNCTION:
-SSL_get_ex_data_X509_STORE_CTX_idx      175    EXIST::FUNCTION:
+SSL_get_ex_data_X509_STORE_CTX_idx      175    EXIST:!VMS:FUNCTION:
+SSL_get_ex_d_X509_STORE_CTX_idx         175    EXIST:VMS:FUNCTION:
 SSL_CTX_set_tmp_dh_callback             176    EXIST::FUNCTION:DH
 SSL_CTX_set_tmp_rsa_callback            177    EXIST::FUNCTION:RSA
 SSL_CTX_set_timeout                     178    EXIST::FUNCTION:
@@ -164,19 +165,24 @@ SSL_CTX_set_cert_store                  181       EXIST::FUNCTION:
 SSL_want                                182    EXIST::FUNCTION:
 SSL_library_init                        183    EXIST::FUNCTION:
 SSL_COMP_add_compression_method         184    EXIST::FUNCTION:
-SSL_add_file_cert_subjects_to_stack     185    EXIST::FUNCTION:
+SSL_add_file_cert_subjects_to_stack     185    EXIST:!VMS:FUNCTION:
+SSL_add_file_cert_subjs_to_stk          185    EXIST:VMS:FUNCTION:
 SSL_set_tmp_rsa_callback                186    EXIST::FUNCTION:RSA
 SSL_set_tmp_dh_callback                 187    EXIST::FUNCTION:DH
 SSL_add_dir_cert_subjects_to_stack      188    NOEXIST::FUNCTION:
+SSL_add_dir_cert_subjs_to_stk           188    EXIST:VMS:FUNCTION:
 SSL_set_session_id_context              189    EXIST::FUNCTION:
-SSL_CTX_use_certificate_chain_file      222    EXIST::FUNCTION:
+SSL_CTX_use_certificate_chain_file      222    EXIST:!VMS:FUNCTION:
+SSL_CTX_use_cert_chain_file             222    EXIST:VMS:FUNCTION:
 SSL_CTX_set_verify_depth                225    EXIST::FUNCTION:
 SSL_set_verify_depth                    226    EXIST::FUNCTION:
 SSL_CTX_get_verify_depth                228    EXIST::FUNCTION:
 SSL_get_verify_depth                    229    EXIST::FUNCTION:
 SSL_CTX_set_session_id_context          231    EXIST::FUNCTION:
-SSL_CTX_set_cert_verify_callback        232    EXIST::FUNCTION:
-SSL_CTX_set_default_passwd_cb_userdata  235    EXIST::FUNCTION:
+SSL_CTX_set_cert_verify_callback        232    EXIST:!VMS:FUNCTION:
+SSL_CTX_set_cert_verify_cb              232    EXIST:VMS:FUNCTION:
+SSL_CTX_set_default_passwd_cb_userdata  235    EXIST:!VMS:FUNCTION:
+SSL_CTX_set_def_passwd_cb_ud            235    EXIST:VMS:FUNCTION:
 SSL_set_purpose                         236    EXIST::FUNCTION:
 SSL_CTX_set_trust                       237    EXIST::FUNCTION:
 SSL_CTX_set_purpose                     238    EXIST::FUNCTION: