make update

Note that all *_it variables are suddenly non-existant according to libeay.num. This is a bug that will be corrected. Please be patient.
2001-02-26 10:54:08 +00:00 · 2001-02-26 10:54:08 +00:00 · d88a26c489
commit d88a26c489
parent 64b48877fa
22 changed files with 1173 additions and 447 deletions
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@ -276,25 +276,25 @@ 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/x509.h
 a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_sign.c
-a_strex.o: ../../e_os.h ../../include/openssl/asn1.h
+a_strex.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-a_strex.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+a_strex.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-a_strex.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+a_strex.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-a_strex.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-a_strex.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+a_strex.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-a_strex.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+a_strex.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
-a_strex.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+a_strex.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-a_strex.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+a_strex.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-a_strex.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+a_strex.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_strex.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-a_strex.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_strex.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+a_strex.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-a_strex.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+a_strex.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_strex.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+a_strex.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-a_strex.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+a_strex.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_strex.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_strex.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_strex.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_strex.o: ../../include/openssl/x509_vfy.h a_strex.c charmap.h
+a_strex.o: 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
 a_strnid.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@ -355,11 +355,10 @@ 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/x509.h
 a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c
-asn1_err.o: ../../e_os.h ../../include/openssl/asn1.h
+asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-asn1_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+asn1_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-asn1_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+asn1_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+asn1_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 asn1_err.o: ../../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: asn1_err.c
@ -512,25 +511,25 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 n_pkey.o: ../cryptlib.h n_pkey.c
-nsseq.o: ../../e_os.h ../../include/openssl/asn1.h
+nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-nsseq.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+nsseq.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-nsseq.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+nsseq.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-nsseq.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+nsseq.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+nsseq.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-nsseq.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+nsseq.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-nsseq.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
+nsseq.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-nsseq.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-nsseq.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+nsseq.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-nsseq.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+nsseq.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-nsseq.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-nsseq.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+nsseq.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-nsseq.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+nsseq.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-nsseq.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+nsseq.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-nsseq.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+nsseq.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-nsseq.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-nsseq.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-nsseq.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h nsseq.c
+nsseq.o: ../../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
 p5_pbe.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
@ -722,77 +721,75 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 t_x509a.o: ../cryptlib.h t_x509a.c
-tasn_dec.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_dec.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_dec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+tasn_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-tasn_dec.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+tasn_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-tasn_dec.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+tasn_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-tasn_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+tasn_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 tasn_dec.o: ../../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: tasn_dec.c
-tasn_enc.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_enc.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_enc.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_enc.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+tasn_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tasn_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
+tasn_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-tasn_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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: tasn_enc.c
-tasn_fre.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_fre.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_fre.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+tasn_fre.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tasn_fre.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
+tasn_fre.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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: tasn_fre.c
-tasn_new.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_new.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_new.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+tasn_new.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+tasn_new.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-tasn_new.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+tasn_new.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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: tasn_new.c
-tasn_typ.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_typ.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_typ.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_typ.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_typ.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+tasn_typ.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tasn_typ.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.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: tasn_typ.c
-tasn_utl.o: ../../e_os.h ../../include/openssl/asn1.h
+tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tasn_utl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tasn_utl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+tasn_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-tasn_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+tasn_utl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-tasn_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+tasn_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-tasn_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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: tasn_utl.c
-x_algor.o: ../../e_os.h ../../include/openssl/asn1.h
+x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-x_algor.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+x_algor.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-x_algor.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+x_algor.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-x_algor.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+x_algor.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+x_algor.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-x_algor.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+x_algor.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-x_algor.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
+x_algor.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_algor.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-x_algor.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+x_algor.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-x_algor.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_algor.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-x_algor.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_algor.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+x_algor.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_algor.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+x_algor.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-x_algor.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+x_algor.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-x_algor.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+x_algor.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_algor.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_algor.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x_algor.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c
 x_algor.o: x_algor.c
 x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h
 x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 x_attrib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
@ -842,26 +839,25 @@ 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/x509.h
 x_crl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_crl.c
-x_exten.o: ../../e_os.h ../../include/openssl/asn1.h
+x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-x_exten.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+x_exten.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-x_exten.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+x_exten.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-x_exten.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+x_exten.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+x_exten.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-x_exten.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+x_exten.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-x_exten.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
+x_exten.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_exten.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-x_exten.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+x_exten.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-x_exten.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_exten.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-x_exten.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_exten.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+x_exten.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_exten.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+x_exten.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-x_exten.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+x_exten.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-x_exten.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+x_exten.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_exten.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_exten.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-x_exten.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_exten.o: ../../include/openssl/x509_vfy.h x_exten.c
 x_exten.o: x_exten.c
 x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x_info.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 x_info.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@ -83,25 +83,25 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-c_rle.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 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 c_rle.c
-c_zlib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+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 c_zlib.c
-comp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-comp_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h
-comp_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
+comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-comp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
+comp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.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: comp_lib.c
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@ -81,17 +81,17 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-engine_all.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_all.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+engine_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+engine_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-engine_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+engine_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-engine_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+engine_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-engine_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+engine_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-engine_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+engine_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-engine_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+engine_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-engine_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+engine_all.o: ../../include/openssl/objects.h
 engine_all.o: ../../include/openssl/opensslconf.h
 engine_all.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 engine_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
@ -100,17 +100,17 @@ engine_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 engine_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 engine_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 engine_all.o: ../../include/openssl/symhacks.h engine_all.c engine_int.h
-engine_err.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_err.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+engine_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+engine_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-engine_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+engine_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-engine_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+engine_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-engine_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+engine_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-engine_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+engine_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-engine_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+engine_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-engine_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+engine_err.o: ../../include/openssl/objects.h
 engine_err.o: ../../include/openssl/opensslconf.h
 engine_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 engine_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@ -86,30 +86,29 @@ err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c
-err_all.o: ../../e_os.h ../../include/openssl/asn1.h
+err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+err_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+err_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+err_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pem2.h
-err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
+err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-err_all.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+err_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-err_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+err_all.o: ../../include/openssl/x509v3.h err_all.c
 err_all.o: err_all.c
 err_prn.o: ../../e_os.h ../../include/openssl/bio.h
 err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@ -247,7 +247,7 @@ digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 digest.o: ../cryptlib.h digest.c
-e_aes.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+e_aes.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_aes.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_aes.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
 e_aes.o: ../../include/openssl/des.h ../../include/openssl/dh.h
@ -481,24 +481,23 @@ evp_enc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_enc.c evp_locl.h
-evp_err.o: ../../e_os.h ../../include/openssl/asn1.h
+evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-evp_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+evp_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-evp_err.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+evp_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+evp_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-evp_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+evp_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-evp_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+evp_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-evp_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+evp_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-evp_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+evp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+evp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
+evp_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+evp_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-evp_err.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+evp_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-evp_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+evp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+evp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-evp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+evp_err.o: ../../include/openssl/symhacks.h evp_err.c
 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/blowfish.h
 evp_key.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@ -80,7 +80,7 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-hmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+hmac.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 hmac.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 hmac.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
 hmac.o: ../../include/openssl/des.h ../../include/openssl/dh.h
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@ -86,14 +86,13 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-o_names.o: ../../e_os.h ../../include/openssl/asn1.h
+o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-o_names.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-o_names.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h
-o_names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-o_names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-o_names.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+o_names.o: ../../include/openssl/symhacks.h o_names.c
 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
 obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@ -103,14 +102,14 @@ 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: ../cryptlib.h obj_dat.c obj_dat.h
-obj_err.o: ../../e_os.h ../../include/openssl/asn1.h
+obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-obj_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-obj_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+obj_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+obj_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-obj_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-obj_err.o: ../../include/openssl/symhacks.h obj_err.c
+obj_err.o: 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
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@ -61,12 +61,12 @@
 * perl obj_dat.pl objects.h obj_dat.h
 */
-#define NUM_NID 410
+#define NUM_NID 480
-#define NUM_SN 408
+#define NUM_SN 481
-#define NUM_LN 408
+#define NUM_LN 481
-#define NUM_OBJ 382
+#define NUM_OBJ 455
-static unsigned char lvalues[3028]={
+static unsigned char lvalues[3694]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@ -449,6 +449,76 @@ static unsigned char lvalues[3028]={
 0x2A,0x86,0x48,0xCE,0x38,0x02,0x01,          /* [3006] OBJ_hold_instruction_none */
 0x2A,0x86,0x48,0xCE,0x38,0x02,0x02,          /* [3013] OBJ_hold_instruction_call_issuer */
 0x2A,0x86,0x48,0xCE,0x38,0x02,0x03,          /* [3020] OBJ_hold_instruction_reject */
 0x00,                                        /* [3027] OBJ_ccitt */
 0x09,                                        /* [3028] OBJ_data */
 0x09,0x92,0x26,                              /* [3029] OBJ_pss */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,          /* [3032] OBJ_ucl */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,     /* [3039] OBJ_pilot */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3047] OBJ_pilotAttributeType */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3056] OBJ_pilotAttributeSyntax */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3065] OBJ_pilotObjectClass */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3074] OBJ_pilotGroups */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3083] OBJ_iA5StringSyntax */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3093] OBJ_caseIgnoreIA5StringSyntax */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3103] OBJ_pilotObject */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3113] OBJ_pilotPerson */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3123] OBJ_account */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3133] OBJ_document */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3143] OBJ_room */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3153] OBJ_documentSeries */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3163] OBJ_rFC822localPart */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3173] OBJ_dNSDomain */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3183] OBJ_domainRelatedObject */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3193] OBJ_friendlyCountry */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3203] OBJ_simpleSecurityObject */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3213] OBJ_pilotOrganization */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3223] OBJ_pilotDSA */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3233] OBJ_qualityLabelledData */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3243] OBJ_userid */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3253] OBJ_textEncodedORAddress */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3263] OBJ_rfc822Mailbox */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3273] OBJ_info */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3283] OBJ_favouriteDrink */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3293] OBJ_roomNumber */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3303] OBJ_photo */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3313] OBJ_userClass */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3323] OBJ_host */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3333] OBJ_manager */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3343] OBJ_documentIdentifier */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3353] OBJ_documentTitle */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3363] OBJ_documentVersion */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3373] OBJ_documentAuthor */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3383] OBJ_documentLocation */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3393] OBJ_homeTelephoneNumber */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3403] OBJ_secretary */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3413] OBJ_otherMailbox */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3423] OBJ_lastModifiedTime */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3433] OBJ_lastModifiedBy */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3443] OBJ_aRecord */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3453] OBJ_ */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3463] OBJ_mXRecord */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3473] OBJ_nSRecord */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3483] OBJ_sOARecord */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3493] OBJ_cNAMERecord */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3503] OBJ_associatedDomain */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3513] OBJ_associatedName */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3523] OBJ_homePostalAddress */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3533] OBJ_personalTitle */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3543] OBJ_mobileTelephoneNumber */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3553] OBJ_pagerTelephoneNumber */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3563] OBJ_friendlyCountryName */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3573] OBJ_organizationalStatus */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3583] OBJ_janetMailbox */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3593] OBJ_mailPreferenceOption */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3603] OBJ_buildingName */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3613] OBJ_dSAQuality */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3623] OBJ_singleLevelQuality */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3633] OBJ_subtreeMinimumQuality */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3643] OBJ_subtreeMaximumQuality */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3653] OBJ_personalSignature */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3663] OBJ_dITRedirect */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3673] OBJ_audio */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3683] OBJ_documentPublisher */
 };
 static ASN1_OBJECT nid_objs[NUM_NID]={
@ -1082,6 +1152,110 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 	NID_hold_instruction_call_issuer,7,&(lvalues[3013]),0},
 {"holdInstructionReject","Hold Instruction Reject",
 	NID_hold_instruction_reject,7,&(lvalues[3020]),0},
 {"CCITT","ccitt",NID_ccitt,1,&(lvalues[3027]),0},
 {"data","data",NID_data,1,&(lvalues[3028]),0},
 {"pss","pss",NID_pss,3,&(lvalues[3029]),0},
 {"ucl","ucl",NID_ucl,7,&(lvalues[3032]),0},
 {"pilot","pilot",NID_pilot,8,&(lvalues[3039]),0},
 {"pilotAttributeType","pilotAttributeType",NID_pilotAttributeType,9,
 	&(lvalues[3047]),0},
 {"pilotAttributeSyntax","pilotAttributeSyntax",
 	NID_pilotAttributeSyntax,9,&(lvalues[3056]),0},
 {"pilotObjectClass","pilotObjectClass",NID_pilotObjectClass,9,
 	&(lvalues[3065]),0},
 {"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3074]),0},
 {"iA5StringSyntax","iA5StringSyntax",NID_iA5StringSyntax,10,
 	&(lvalues[3083]),0},
 {"caseIgnoreIA5StringSyntax","caseIgnoreIA5StringSyntax",
 	NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3093]),0},
 {"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3103]),0},
 {"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3113]),0},
 {"account","account",NID_account,10,&(lvalues[3123]),0},
 {"document","document",NID_document,10,&(lvalues[3133]),0},
 {"room","room",NID_room,10,&(lvalues[3143]),0},
 {"documentSeries","documentSeries",NID_documentSeries,10,
 	&(lvalues[3153]),0},
 {"rFC822localPart","rFC822localPart",NID_rFC822localPart,10,
 	&(lvalues[3163]),0},
 {"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3173]),0},
 {"domainRelatedObject","domainRelatedObject",NID_domainRelatedObject,
 	10,&(lvalues[3183]),0},
 {"friendlyCountry","friendlyCountry",NID_friendlyCountry,10,
 	&(lvalues[3193]),0},
 {"simpleSecurityObject","simpleSecurityObject",
 	NID_simpleSecurityObject,10,&(lvalues[3203]),0},
 {"pilotOrganization","pilotOrganization",NID_pilotOrganization,10,
 	&(lvalues[3213]),0},
 {"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3223]),0},
 {"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData,
 	10,&(lvalues[3233]),0},
 {"userid","userid",NID_userid,10,&(lvalues[3243]),0},
 {"textEncodedORAddress","textEncodedORAddress",
 	NID_textEncodedORAddress,10,&(lvalues[3253]),0},
 {"rfc822Mailbox","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3263]),0},
 {"info","info",NID_info,10,&(lvalues[3273]),0},
 {"favouriteDrink","favouriteDrink",NID_favouriteDrink,10,
 	&(lvalues[3283]),0},
 {"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3293]),0},
 {"photo","photo",NID_photo,10,&(lvalues[3303]),0},
 {"userClass","userClass",NID_userClass,10,&(lvalues[3313]),0},
 {"host","host",NID_host,10,&(lvalues[3323]),0},
 {"manager","manager",NID_manager,10,&(lvalues[3333]),0},
 {"documentIdentifier","documentIdentifier",NID_documentIdentifier,10,
 	&(lvalues[3343]),0},
 {"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3353]),0},
 {"documentVersion","documentVersion",NID_documentVersion,10,
 	&(lvalues[3363]),0},
 {"documentAuthor","documentAuthor",NID_documentAuthor,10,
 	&(lvalues[3373]),0},
 {"documentLocation","documentLocation",NID_documentLocation,10,
 	&(lvalues[3383]),0},
 {"homeTelephoneNumber","homeTelephoneNumber",NID_homeTelephoneNumber,
 	10,&(lvalues[3393]),0},
 {"secretary","secretary",NID_secretary,10,&(lvalues[3403]),0},
 {"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3413]),0},
 {"lastModifiedTime","lastModifiedTime",NID_lastModifiedTime,10,
 	&(lvalues[3423]),0},
 {"lastModifiedBy","lastModifiedBy",NID_lastModifiedBy,10,
 	&(lvalues[3433]),0},
 {"aRecord","aRecord",NID_aRecord,10,&(lvalues[3443]),0},
 {"NULL","NULL",NID_,10,&(lvalues[3453]),0},
 {"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3463]),0},
 {"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3473]),0},
 {"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3483]),0},
 {"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3493]),0},
 {"associatedDomain","associatedDomain",NID_associatedDomain,10,
 	&(lvalues[3503]),0},
 {"associatedName","associatedName",NID_associatedName,10,
 	&(lvalues[3513]),0},
 {"homePostalAddress","homePostalAddress",NID_homePostalAddress,10,
 	&(lvalues[3523]),0},
 {"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3533]),0},
 {"mobileTelephoneNumber","mobileTelephoneNumber",
 	NID_mobileTelephoneNumber,10,&(lvalues[3543]),0},
 {"pagerTelephoneNumber","pagerTelephoneNumber",
 	NID_pagerTelephoneNumber,10,&(lvalues[3553]),0},
 {"friendlyCountryName","friendlyCountryName",NID_friendlyCountryName,
 	10,&(lvalues[3563]),0},
 {"organizationalStatus","organizationalStatus",
 	NID_organizationalStatus,10,&(lvalues[3573]),0},
 {"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3583]),0},
 {"mailPreferenceOption","mailPreferenceOption",
 	NID_mailPreferenceOption,10,&(lvalues[3593]),0},
 {"buildingName","buildingName",NID_buildingName,10,&(lvalues[3603]),0},
 {"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3613]),0},
 {"singleLevelQuality","singleLevelQuality",NID_singleLevelQuality,10,
 	&(lvalues[3623]),0},
 {"subtreeMinimumQuality","subtreeMinimumQuality",
 	NID_subtreeMinimumQuality,10,&(lvalues[3633]),0},
 {"subtreeMaximumQuality","subtreeMaximumQuality",
 	NID_subtreeMaximumQuality,10,&(lvalues[3643]),0},
 {"personalSignature","personalSignature",NID_personalSignature,10,
 	&(lvalues[3653]),0},
 {"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3663]),0},
 {"audio","audio",NID_audio,10,&(lvalues[3673]),0},
 {"documentPublisher","documentPublisher",NID_documentPublisher,10,
 	&(lvalues[3683]),0},
 };
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@ -1107,6 +1281,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[110]),/* "CAST5-CFB" */
 &(nid_objs[109]),/* "CAST5-ECB" */
 &(nid_objs[111]),/* "CAST5-OFB" */
 &(nid_objs[410]),/* "CCITT" */
 &(nid_objs[13]),/* "CN" */
 &(nid_objs[141]),/* "CRLReason" */
 &(nid_objs[367]),/* "CrlID" */
@ -1148,6 +1323,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[ 4]),/* "MD5" */
 &(nid_objs[114]),/* "MD5-SHA1" */
 &(nid_objs[95]),/* "MDC2" */
 &(nid_objs[393]),/* "NULL" */
 &(nid_objs[118]),/* "NULL" */
 &(nid_objs[456]),/* "NULL" */
 &(nid_objs[480]),/* "NULL" */
 &(nid_objs[57]),/* "Netscape" */
 &(nid_objs[366]),/* "Nonce" */
 &(nid_objs[17]),/* "O" */
@ -1211,19 +1390,27 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[184]),/* "X9-57" */
 &(nid_objs[185]),/* "X9cm" */
 &(nid_objs[125]),/* "ZLIB" */
 &(nid_objs[455]),/* "aRecord" */
 &(nid_objs[289]),/* "aaControls" */
 &(nid_objs[287]),/* "ac-auditEntity" */
 &(nid_objs[288]),/* "ac-targeting" */
 &(nid_objs[368]),/* "acceptableResponses" */
 &(nid_objs[423]),/* "account" */
 &(nid_objs[363]),/* "ad_timestamping" */
 &(nid_objs[376]),/* "algorithm" */
 &(nid_objs[370]),/* "archiveCutoff" */
 &(nid_objs[461]),/* "associatedDomain" */
 &(nid_objs[462]),/* "associatedName" */
 &(nid_objs[478]),/* "audio" */
 &(nid_objs[177]),/* "authorityInfoAccess" */
 &(nid_objs[90]),/* "authorityKeyIdentifier" */
 &(nid_objs[87]),/* "basicConstraints" */
 &(nid_objs[365]),/* "basicOCSPResponse" */
 &(nid_objs[285]),/* "biometricInfo" */
 &(nid_objs[471]),/* "buildingName" */
 &(nid_objs[460]),/* "cNAMERecord" */
 &(nid_objs[179]),/* "caIssuers" */
 &(nid_objs[420]),/* "caseIgnoreIA5StringSyntax" */
 &(nid_objs[152]),/* "certBag" */
 &(nid_objs[89]),/* "certificatePolicies" */
 &(nid_objs[54]),/* "challengePassword" */
@ -1234,12 +1421,25 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[153]),/* "crlBag" */
 &(nid_objs[103]),/* "crlDistributionPoints" */
 &(nid_objs[88]),/* "crlNumber" */
 &(nid_objs[477]),/* "dITRedirect" */
 &(nid_objs[428]),/* "dNSDomain" */
 &(nid_objs[472]),/* "dSAQuality" */
 &(nid_objs[411]),/* "data" */
 &(nid_objs[390]),/* "dcobject" */
 &(nid_objs[140]),/* "deltaCRL" */
 &(nid_objs[28]),/* "dhKeyAgreement" */
 &(nid_objs[382]),/* "directory" */
 &(nid_objs[174]),/* "dnQualifier" */
 &(nid_objs[424]),/* "document" */
 &(nid_objs[448]),/* "documentAuthor" */
 &(nid_objs[445]),/* "documentIdentifier" */
 &(nid_objs[449]),/* "documentLocation" */
 &(nid_objs[479]),/* "documentPublisher" */
 &(nid_objs[426]),/* "documentSeries" */
 &(nid_objs[446]),/* "documentTitle" */
 &(nid_objs[447]),/* "documentVersion" */
 &(nid_objs[392]),/* "domain" */
 &(nid_objs[429]),/* "domainRelatedObject" */
 &(nid_objs[132]),/* "emailProtection" */
 &(nid_objs[389]),/* "enterprises" */
 &(nid_objs[384]),/* "experimental" */
@ -1247,12 +1447,19 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[56]),/* "extendedCertificateAttributes" */
 &(nid_objs[126]),/* "extendedKeyUsage" */
 &(nid_objs[372]),/* "extendedStatus" */
 &(nid_objs[439]),/* "favouriteDrink" */
 &(nid_objs[430]),/* "friendlyCountry" */
 &(nid_objs[467]),/* "friendlyCountryName" */
 &(nid_objs[156]),/* "friendlyName" */
 &(nid_objs[163]),/* "hmacWithSHA1" */
 &(nid_objs[408]),/* "holdInstructionCallIssuer" */
 &(nid_objs[406]),/* "holdInstructionCode" */
 &(nid_objs[407]),/* "holdInstructionNone" */
 &(nid_objs[409]),/* "holdInstructionReject" */
 &(nid_objs[463]),/* "homePostalAddress" */
 &(nid_objs[450]),/* "homeTelephoneNumber" */
 &(nid_objs[443]),/* "host" */
 &(nid_objs[419]),/* "iA5StringSyntax" */
 &(nid_objs[266]),/* "id-aca" */
 &(nid_objs[355]),/* "id-aca-accessIdentity" */
 &(nid_objs[354]),/* "id-aca-authenticationInfo" */
@ -1419,24 +1626,33 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[194]),/* "id-smime-spq" */
 &(nid_objs[250]),/* "id-smime-spq-ets-sqt-unotice" */
 &(nid_objs[249]),/* "id-smime-spq-ets-sqt-uri" */
 &(nid_objs[438]),/* "info" */
 &(nid_objs[142]),/* "invalidityDate" */
 &(nid_objs[294]),/* "ipsecEndSystem" */
 &(nid_objs[295]),/* "ipsecTunnel" */
 &(nid_objs[296]),/* "ipsecUser" */
 &(nid_objs[86]),/* "issuerAltName" */
 &(nid_objs[469]),/* "janetMailbox" */
 &(nid_objs[150]),/* "keyBag" */
 &(nid_objs[83]),/* "keyUsage" */
 &(nid_objs[454]),/* "lastModifiedBy" */
 &(nid_objs[453]),/* "lastModifiedTime" */
 &(nid_objs[157]),/* "localKeyID" */
 &(nid_objs[457]),/* "mXRecord" */
 &(nid_objs[388]),/* "mail" */
 &(nid_objs[470]),/* "mailPreferenceOption" */
 &(nid_objs[444]),/* "manager" */
 &(nid_objs[182]),/* "member-body" */
 &(nid_objs[51]),/* "messageDigest" */
 &(nid_objs[383]),/* "mgmt" */
 &(nid_objs[465]),/* "mobileTelephoneNumber" */
 &(nid_objs[136]),/* "msCTLSign" */
 &(nid_objs[135]),/* "msCodeCom" */
 &(nid_objs[134]),/* "msCodeInd" */
 &(nid_objs[138]),/* "msEFS" */
 &(nid_objs[171]),/* "msExtReq" */
 &(nid_objs[137]),/* "msSGC" */
 &(nid_objs[458]),/* "nSRecord" */
 &(nid_objs[173]),/* "name" */
 &(nid_objs[369]),/* "noCheck" */
 &(nid_objs[72]),/* "nsBaseUrl" */
@ -1451,8 +1667,23 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[73]),/* "nsRevocationUrl" */
 &(nid_objs[139]),/* "nsSGC" */
 &(nid_objs[77]),/* "nsSslServerName" */
 &(nid_objs[468]),/* "organizationalStatus" */
 &(nid_objs[452]),/* "otherMailbox" */
 &(nid_objs[466]),/* "pagerTelephoneNumber" */
 &(nid_objs[374]),/* "path" */
 &(nid_objs[112]),/* "pbeWithMD5AndCast5CBC" */
 &(nid_objs[476]),/* "personalSignature" */
 &(nid_objs[464]),/* "personalTitle" */
 &(nid_objs[441]),/* "photo" */
 &(nid_objs[414]),/* "pilot" */
 &(nid_objs[416]),/* "pilotAttributeSyntax" */
 &(nid_objs[415]),/* "pilotAttributeType" */
 &(nid_objs[433]),/* "pilotDSA" */
 &(nid_objs[418]),/* "pilotGroups" */
 &(nid_objs[421]),/* "pilotObject" */
 &(nid_objs[417]),/* "pilotObjectClass" */
 &(nid_objs[432]),/* "pilotOrganization" */
 &(nid_objs[422]),/* "pilotPerson" */
 &(nid_objs[ 2]),/* "pkcs" */
 &(nid_objs[186]),/* "pkcs1" */
 &(nid_objs[27]),/* "pkcs3" */
@ -1468,28 +1699,44 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[47]),/* "pkcs9" */
 &(nid_objs[385]),/* "private" */
 &(nid_objs[84]),/* "privateKeyUsagePeriod" */
 &(nid_objs[412]),/* "pss" */
 &(nid_objs[286]),/* "qcStatements" */
 &(nid_objs[434]),/* "qualityLabelledData" */
 &(nid_objs[427]),/* "rFC822localPart" */
 &(nid_objs[437]),/* "rfc822Mailbox" */
 &(nid_objs[425]),/* "room" */
 &(nid_objs[440]),/* "roomNumber" */
 &(nid_objs[ 6]),/* "rsaEncryption" */
 &(nid_objs[377]),/* "rsaSignature" */
 &(nid_objs[ 1]),/* "rsadsi" */
 &(nid_objs[459]),/* "sOARecord" */
 &(nid_objs[155]),/* "safeContentsBag" */
 &(nid_objs[291]),/* "sbqp-autonomousSysNum" */
 &(nid_objs[290]),/* "sbqp-ipAddrBlock" */
 &(nid_objs[292]),/* "sbqp-routerIdentifier" */
 &(nid_objs[159]),/* "sdsiCertificate" */
 &(nid_objs[154]),/* "secretBag" */
 &(nid_objs[451]),/* "secretary" */
 &(nid_objs[386]),/* "security" */
 &(nid_objs[129]),/* "serverAuth" */
 &(nid_objs[371]),/* "serviceLocator" */
 &(nid_objs[52]),/* "signingTime" */
 &(nid_objs[431]),/* "simpleSecurityObject" */
 &(nid_objs[473]),/* "singleLevelQuality" */
 &(nid_objs[387]),/* "snmpv2" */
 &(nid_objs[85]),/* "subjectAltName" */
 &(nid_objs[82]),/* "subjectKeyIdentifier" */
 &(nid_objs[475]),/* "subtreeMaximumQuality" */
 &(nid_objs[474]),/* "subtreeMinimumQuality" */
 &(nid_objs[436]),/* "textEncodedORAddress" */
 &(nid_objs[293]),/* "textNotice" */
 &(nid_objs[133]),/* "timeStamping" */
 &(nid_objs[375]),/* "trustRoot" */
 &(nid_objs[413]),/* "ucl" */
 &(nid_objs[55]),/* "unstructuredAddress" */
 &(nid_objs[49]),/* "unstructuredName" */
 &(nid_objs[442]),/* "userClass" */
 &(nid_objs[435]),/* "userid" */
 &(nid_objs[373]),/* "valid" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@ -1528,6 +1775,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[134]),/* "Microsoft Individual Code Signing" */
 &(nid_objs[137]),/* "Microsoft Server Gated Crypto" */
 &(nid_objs[136]),/* "Microsoft Trust List Signing" */
 &(nid_objs[480]),/* "NULL" */
 &(nid_objs[393]),/* "NULL" */
 &(nid_objs[456]),/* "NULL" */
 &(nid_objs[118]),/* "NULL" */
 &(nid_objs[72]),/* "Netscape Base Url" */
 &(nid_objs[76]),/* "Netscape CA Policy Url" */
 &(nid_objs[74]),/* "Netscape CA Revocation Url" */
@ -1582,9 +1833,11 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[82]),/* "X509v3 Subject Key Identifier" */
 &(nid_objs[184]),/* "X9.57" */
 &(nid_objs[185]),/* "X9.57 CM ?" */
 &(nid_objs[455]),/* "aRecord" */
 &(nid_objs[289]),/* "aaControls" */
 &(nid_objs[287]),/* "ac-auditEntity" */
 &(nid_objs[288]),/* "ac-targeting" */
 &(nid_objs[423]),/* "account" */
 &(nid_objs[364]),/* "ad dvcs" */
 &(nid_objs[395]),/* "aes-128-cbc" */
 &(nid_objs[397]),/* "aes-128-cfb" */
@ -1599,14 +1852,21 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[402]),/* "aes-256-ecb" */
 &(nid_objs[404]),/* "aes-256-ofb" */
 &(nid_objs[376]),/* "algorithm" */
 &(nid_objs[461]),/* "associatedDomain" */
 &(nid_objs[462]),/* "associatedName" */
 &(nid_objs[478]),/* "audio" */
 &(nid_objs[91]),/* "bf-cbc" */
 &(nid_objs[93]),/* "bf-cfb" */
 &(nid_objs[92]),/* "bf-ecb" */
 &(nid_objs[94]),/* "bf-ofb" */
 &(nid_objs[471]),/* "buildingName" */
 &(nid_objs[460]),/* "cNAMERecord" */
 &(nid_objs[420]),/* "caseIgnoreIA5StringSyntax" */
 &(nid_objs[108]),/* "cast5-cbc" */
 &(nid_objs[110]),/* "cast5-cfb" */
 &(nid_objs[109]),/* "cast5-ecb" */
 &(nid_objs[111]),/* "cast5-ofb" */
 &(nid_objs[410]),/* "ccitt" */
 &(nid_objs[152]),/* "certBag" */
 &(nid_objs[54]),/* "challengePassword" */
 &(nid_objs[13]),/* "commonName" */
@ -1614,6 +1874,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[53]),/* "countersignature" */
 &(nid_objs[14]),/* "countryName" */
 &(nid_objs[153]),/* "crlBag" */
 &(nid_objs[477]),/* "dITRedirect" */
 &(nid_objs[428]),/* "dNSDomain" */
 &(nid_objs[472]),/* "dSAQuality" */
 &(nid_objs[411]),/* "data" */
 &(nid_objs[390]),/* "dcObject" */
 &(nid_objs[31]),/* "des-cbc" */
 &(nid_objs[30]),/* "des-cfb" */
@ -1633,8 +1897,17 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[11]),/* "directory services (X.500)" */
 &(nid_objs[378]),/* "directory services - algorithms" */
 &(nid_objs[174]),/* "dnQualifier" */
 &(nid_objs[424]),/* "document" */
 &(nid_objs[448]),/* "documentAuthor" */
 &(nid_objs[445]),/* "documentIdentifier" */
 &(nid_objs[449]),/* "documentLocation" */
 &(nid_objs[479]),/* "documentPublisher" */
 &(nid_objs[426]),/* "documentSeries" */
 &(nid_objs[446]),/* "documentTitle" */
 &(nid_objs[447]),/* "documentVersion" */
 &(nid_objs[380]),/* "dod" */
 &(nid_objs[391]),/* "domainComponent" */
 &(nid_objs[429]),/* "domainRelatedObject" */
 &(nid_objs[116]),/* "dsaEncryption" */
 &(nid_objs[67]),/* "dsaEncryption-old" */
 &(nid_objs[66]),/* "dsaWithSHA" */
@ -1643,9 +1916,16 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[297]),/* "dvcs" */
 &(nid_objs[48]),/* "emailAddress" */
 &(nid_objs[56]),/* "extendedCertificateAttributes" */
 &(nid_objs[439]),/* "favouriteDrink" */
 &(nid_objs[430]),/* "friendlyCountry" */
 &(nid_objs[467]),/* "friendlyCountryName" */
 &(nid_objs[156]),/* "friendlyName" */
 &(nid_objs[99]),/* "givenName" */
 &(nid_objs[163]),/* "hmacWithSHA1" */
 &(nid_objs[463]),/* "homePostalAddress" */
 &(nid_objs[450]),/* "homeTelephoneNumber" */
 &(nid_objs[443]),/* "host" */
 &(nid_objs[419]),/* "iA5StringSyntax" */
 &(nid_objs[381]),/* "iana" */
 &(nid_objs[266]),/* "id-aca" */
 &(nid_objs[355]),/* "id-aca-accessIdentity" */
@ -1815,11 +2095,18 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[35]),/* "idea-cfb" */
 &(nid_objs[36]),/* "idea-ecb" */
 &(nid_objs[46]),/* "idea-ofb" */
 &(nid_objs[438]),/* "info" */
 &(nid_objs[101]),/* "initials" */
 &(nid_objs[181]),/* "iso" */
 &(nid_objs[469]),/* "janetMailbox" */
 &(nid_objs[150]),/* "keyBag" */
 &(nid_objs[454]),/* "lastModifiedBy" */
 &(nid_objs[453]),/* "lastModifiedTime" */
 &(nid_objs[157]),/* "localKeyID" */
 &(nid_objs[15]),/* "localityName" */
 &(nid_objs[457]),/* "mXRecord" */
 &(nid_objs[470]),/* "mailPreferenceOption" */
 &(nid_objs[444]),/* "manager" */
 &(nid_objs[ 3]),/* "md2" */
 &(nid_objs[ 7]),/* "md2WithRSAEncryption" */
 &(nid_objs[257]),/* "md4" */
@ -1830,10 +2117,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[95]),/* "mdc2" */
 &(nid_objs[96]),/* "mdc2WithRSA" */
 &(nid_objs[51]),/* "messageDigest" */
 &(nid_objs[465]),/* "mobileTelephoneNumber" */
 &(nid_objs[458]),/* "nSRecord" */
 &(nid_objs[173]),/* "name" */
 &(nid_objs[379]),/* "org" */
 &(nid_objs[17]),/* "organizationName" */
 &(nid_objs[468]),/* "organizationalStatus" */
 &(nid_objs[18]),/* "organizationalUnitName" */
 &(nid_objs[452]),/* "otherMailbox" */
 &(nid_objs[466]),/* "pagerTelephoneNumber" */
 &(nid_objs[374]),/* "path" */
 &(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */
 &(nid_objs[168]),/* "pbeWithMD2AndRC2-CBC" */
@ -1848,6 +2140,18 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[145]),/* "pbeWithSHA1And40BitRC4" */
 &(nid_objs[170]),/* "pbeWithSHA1AndDES-CBC" */
 &(nid_objs[68]),/* "pbeWithSHA1AndRC2-CBC" */
 &(nid_objs[476]),/* "personalSignature" */
 &(nid_objs[464]),/* "personalTitle" */
 &(nid_objs[441]),/* "photo" */
 &(nid_objs[414]),/* "pilot" */
 &(nid_objs[416]),/* "pilotAttributeSyntax" */
 &(nid_objs[415]),/* "pilotAttributeType" */
 &(nid_objs[433]),/* "pilotDSA" */
 &(nid_objs[418]),/* "pilotGroups" */
 &(nid_objs[421]),/* "pilotObject" */
 &(nid_objs[417]),/* "pilotObjectClass" */
 &(nid_objs[432]),/* "pilotOrganization" */
 &(nid_objs[422]),/* "pilotPerson" */
 &(nid_objs[186]),/* "pkcs1" */
 &(nid_objs[27]),/* "pkcs3" */
 &(nid_objs[187]),/* "pkcs5" */
@ -1860,7 +2164,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[22]),/* "pkcs7-signedData" */
 &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */
 &(nid_objs[47]),/* "pkcs9" */
 &(nid_objs[412]),/* "pss" */
 &(nid_objs[286]),/* "qcStatements" */
 &(nid_objs[434]),/* "qualityLabelledData" */
 &(nid_objs[427]),/* "rFC822localPart" */
 &(nid_objs[98]),/* "rc2-40-cbc" */
 &(nid_objs[166]),/* "rc2-64-cbc" */
 &(nid_objs[37]),/* "rc2-cbc" */
@ -1873,18 +2180,23 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[122]),/* "rc5-cfb" */
 &(nid_objs[121]),/* "rc5-ecb" */
 &(nid_objs[123]),/* "rc5-ofb" */
 &(nid_objs[437]),/* "rfc822Mailbox" */
 &(nid_objs[117]),/* "ripemd160" */
 &(nid_objs[119]),/* "ripemd160WithRSA" */
 &(nid_objs[425]),/* "room" */
 &(nid_objs[440]),/* "roomNumber" */
 &(nid_objs[19]),/* "rsa" */
 &(nid_objs[ 6]),/* "rsaEncryption" */
 &(nid_objs[377]),/* "rsaSignature" */
 &(nid_objs[124]),/* "run length compression" */
 &(nid_objs[459]),/* "sOARecord" */
 &(nid_objs[155]),/* "safeContentsBag" */
 &(nid_objs[291]),/* "sbqp-autonomousSysNum" */
 &(nid_objs[290]),/* "sbqp-ipAddrBlock" */
 &(nid_objs[292]),/* "sbqp-routerIdentifier" */
 &(nid_objs[159]),/* "sdsiCertificate" */
 &(nid_objs[154]),/* "secretBag" */
 &(nid_objs[451]),/* "secretary" */
 &(nid_objs[105]),/* "serialNumber" */
 &(nid_objs[41]),/* "sha" */
 &(nid_objs[64]),/* "sha1" */
@ -1892,14 +2204,22 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[65]),/* "sha1WithRSAEncryption" */
 &(nid_objs[42]),/* "shaWithRSAEncryption" */
 &(nid_objs[52]),/* "signingTime" */
 &(nid_objs[431]),/* "simpleSecurityObject" */
 &(nid_objs[473]),/* "singleLevelQuality" */
 &(nid_objs[16]),/* "stateOrProvinceName" */
 &(nid_objs[475]),/* "subtreeMaximumQuality" */
 &(nid_objs[474]),/* "subtreeMinimumQuality" */
 &(nid_objs[100]),/* "surname" */
 &(nid_objs[436]),/* "textEncodedORAddress" */
 &(nid_objs[293]),/* "textNotice" */
 &(nid_objs[106]),/* "title" */
 &(nid_objs[413]),/* "ucl" */
 &(nid_objs[ 0]),/* "undefined" */
 &(nid_objs[102]),/* "uniqueIdentifier" */
 &(nid_objs[55]),/* "unstructuredAddress" */
 &(nid_objs[49]),/* "unstructuredName" */
 &(nid_objs[442]),/* "userClass" */
 &(nid_objs[435]),/* "userid" */
 &(nid_objs[373]),/* "valid" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@ -1908,7 +2228,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[ 0]),/* OBJ_undef                        0 */
 &(nid_objs[410]),/* OBJ_ccitt                        0 */
 &(nid_objs[389]),/* OBJ_Enterprises                   1 */
 &(nid_objs[411]),/* OBJ_data                         0 9 */
 &(nid_objs[181]),/* OBJ_iso                          1 */
 &(nid_objs[182]),/* OBJ_member_body                  1 2 */
 &(nid_objs[379]),/* OBJ_org                          1 3 */
@ -1917,6 +2239,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[12]),/* OBJ_X509                         2 5 4 */
 &(nid_objs[378]),/* OBJ_X500algorithms               2 5 8 */
 &(nid_objs[81]),/* OBJ_id_ce                        2 5 29 */
 &(nid_objs[412]),/* OBJ_pss                          0 9 2342 */
 &(nid_objs[183]),/* OBJ_ISO_US                       1 2 840 */
 &(nid_objs[381]),/* OBJ_iana                         1 3 6 1 */
 &(nid_objs[13]),/* OBJ_commonName                   2 5 4 3 */
@ -1984,6 +2307,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[185]),/* OBJ_X9cm                         1 2 840 10040 4 */
 &(nid_objs[127]),/* OBJ_id_pkix                      1 3 6 1 5 5 7 */
 &(nid_objs[119]),/* OBJ_ripemd160WithRSA             1 3 36 3 3 1 2 */
 &(nid_objs[413]),/* OBJ_ucl                          0 9 2342 19200300 */
 &(nid_objs[ 2]),/* OBJ_pkcs                         1 2 840 113549 1 */
 &(nid_objs[407]),/* OBJ_hold_instruction_none        1 2 840 10040 2 1 */
 &(nid_objs[408]),/* OBJ_hold_instruction_call_issuer 1 2 840 10040 2 2 */
@ -2005,6 +2329,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[268]),/* OBJ_id_cct                       1 3 6 1 5 5 7 12 */
 &(nid_objs[176]),/* OBJ_id_ad                        1 3 6 1 5 5 7 48 */
 &(nid_objs[57]),/* OBJ_netscape                     2 16 840 1 113730 */
 &(nid_objs[414]),/* OBJ_pilot                        0 9 2342 19200300 100 */
 &(nid_objs[186]),/* OBJ_pkcs1                        1 2 840 113549 1 1 */
 &(nid_objs[27]),/* OBJ_pkcs3                        1 2 840 113549 1 3 */
 &(nid_objs[187]),/* OBJ_pkcs5                        1 2 840 113549 1 5 */
@ -2119,6 +2444,10 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[364]),/* OBJ_ad_dvcs                      1 3 6 1 5 5 7 48 4 */
 &(nid_objs[58]),/* OBJ_netscape_cert_extension      2 16 840 1 113730 1 */
 &(nid_objs[59]),/* OBJ_netscape_data_type           2 16 840 1 113730 2 */
 &(nid_objs[415]),/* OBJ_pilotAttributeType           0 9 2342 19200300 100 1 */
 &(nid_objs[416]),/* OBJ_pilotAttributeSyntax         0 9 2342 19200300 100 3 */
 &(nid_objs[417]),/* OBJ_pilotObjectClass             0 9 2342 19200300 100 4 */
 &(nid_objs[418]),/* OBJ_pilotGroups                  0 9 2342 19200300 100 10 */
 &(nid_objs[108]),/* OBJ_cast5_cbc                    1 2 840 113533 7 66 10 */
 &(nid_objs[112]),/* OBJ_pbeWithMD5AndCast5_CBC       1 2 840 113533 7 66 12 */
 &(nid_objs[ 6]),/* OBJ_rsaEncryption                1 2 840 113549 1 1 1 */
@ -2197,8 +2526,72 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[78]),/* OBJ_netscape_comment             2 16 840 1 113730 1 13 */
 &(nid_objs[79]),/* OBJ_netscape_cert_sequence       2 16 840 1 113730 2 5 */
 &(nid_objs[139]),/* OBJ_ns_sgc                       2 16 840 1 113730 4 1 */
 &(nid_objs[435]),/* OBJ_userid                       0 9 2342 19200300 100 1 1 */
 &(nid_objs[436]),/* OBJ_textEncodedORAddress         0 9 2342 19200300 100 1 2 */
 &(nid_objs[437]),/* OBJ_rfc822Mailbox                0 9 2342 19200300 100 1 3 */
 &(nid_objs[438]),/* OBJ_info                         0 9 2342 19200300 100 1 4 */
 &(nid_objs[439]),/* OBJ_favouriteDrink               0 9 2342 19200300 100 1 5 */
 &(nid_objs[440]),/* OBJ_roomNumber                   0 9 2342 19200300 100 1 6 */
 &(nid_objs[441]),/* OBJ_photo                        0 9 2342 19200300 100 1 7 */
 &(nid_objs[442]),/* OBJ_userClass                    0 9 2342 19200300 100 1 8 */
 &(nid_objs[443]),/* OBJ_host                         0 9 2342 19200300 100 1 9 */
 &(nid_objs[444]),/* OBJ_manager                      0 9 2342 19200300 100 1 10 */
 &(nid_objs[445]),/* OBJ_documentIdentifier           0 9 2342 19200300 100 1 11 */
 &(nid_objs[446]),/* OBJ_documentTitle                0 9 2342 19200300 100 1 12 */
 &(nid_objs[447]),/* OBJ_documentVersion              0 9 2342 19200300 100 1 13 */
 &(nid_objs[448]),/* OBJ_documentAuthor               0 9 2342 19200300 100 1 14 */
 &(nid_objs[449]),/* OBJ_documentLocation             0 9 2342 19200300 100 1 15 */
 &(nid_objs[450]),/* OBJ_homeTelephoneNumber          0 9 2342 19200300 100 1 20 */
 &(nid_objs[451]),/* OBJ_secretary                    0 9 2342 19200300 100 1 21 */
 &(nid_objs[452]),/* OBJ_otherMailbox                 0 9 2342 19200300 100 1 22 */
 &(nid_objs[453]),/* OBJ_lastModifiedTime             0 9 2342 19200300 100 1 23 */
 &(nid_objs[454]),/* OBJ_lastModifiedBy               0 9 2342 19200300 100 1 24 */
 &(nid_objs[391]),/* OBJ_domainComponent              0 9 2342 19200300 100 1 25 */
 &(nid_objs[455]),/* OBJ_aRecord                      0 9 2342 19200300 100 1 26 */
 &(nid_objs[456]),/* OBJ_                             0 9 2342 19200300 100 1 27 */
 &(nid_objs[393]),/* OBJ_                             0 9 2342 19200300 100 1 27 */
 &(nid_objs[118]),/* OBJ_                             0 9 2342 19200300 100 1 27 */
 &(nid_objs[480]),/* OBJ_                             0 9 2342 19200300 100 1 27 */
 &(nid_objs[457]),/* OBJ_mXRecord                     0 9 2342 19200300 100 1 28 */
 &(nid_objs[458]),/* OBJ_nSRecord                     0 9 2342 19200300 100 1 29 */
 &(nid_objs[459]),/* OBJ_sOARecord                    0 9 2342 19200300 100 1 30 */
 &(nid_objs[460]),/* OBJ_cNAMERecord                  0 9 2342 19200300 100 1 31 */
 &(nid_objs[461]),/* OBJ_associatedDomain             0 9 2342 19200300 100 1 37 */
 &(nid_objs[462]),/* OBJ_associatedName               0 9 2342 19200300 100 1 38 */
 &(nid_objs[463]),/* OBJ_homePostalAddress            0 9 2342 19200300 100 1 39 */
 &(nid_objs[464]),/* OBJ_personalTitle                0 9 2342 19200300 100 1 40 */
 &(nid_objs[465]),/* OBJ_mobileTelephoneNumber        0 9 2342 19200300 100 1 41 */
 &(nid_objs[466]),/* OBJ_pagerTelephoneNumber         0 9 2342 19200300 100 1 42 */
 &(nid_objs[467]),/* OBJ_friendlyCountryName          0 9 2342 19200300 100 1 43 */
 &(nid_objs[468]),/* OBJ_organizationalStatus         0 9 2342 19200300 100 1 45 */
 &(nid_objs[469]),/* OBJ_janetMailbox                 0 9 2342 19200300 100 1 46 */
 &(nid_objs[470]),/* OBJ_mailPreferenceOption         0 9 2342 19200300 100 1 47 */
 &(nid_objs[471]),/* OBJ_buildingName                 0 9 2342 19200300 100 1 48 */
 &(nid_objs[472]),/* OBJ_dSAQuality                   0 9 2342 19200300 100 1 49 */
 &(nid_objs[473]),/* OBJ_singleLevelQuality           0 9 2342 19200300 100 1 50 */
 &(nid_objs[474]),/* OBJ_subtreeMinimumQuality        0 9 2342 19200300 100 1 51 */
 &(nid_objs[475]),/* OBJ_subtreeMaximumQuality        0 9 2342 19200300 100 1 52 */
 &(nid_objs[476]),/* OBJ_personalSignature            0 9 2342 19200300 100 1 53 */
 &(nid_objs[477]),/* OBJ_dITRedirect                  0 9 2342 19200300 100 1 54 */
 &(nid_objs[478]),/* OBJ_audio                        0 9 2342 19200300 100 1 55 */
 &(nid_objs[479]),/* OBJ_documentPublisher            0 9 2342 19200300 100 1 56 */
 &(nid_objs[419]),/* OBJ_iA5StringSyntax              0 9 2342 19200300 100 3 4 */
 &(nid_objs[420]),/* OBJ_caseIgnoreIA5StringSyntax    0 9 2342 19200300 100 3 5 */
 &(nid_objs[421]),/* OBJ_pilotObject                  0 9 2342 19200300 100 4 3 */
 &(nid_objs[422]),/* OBJ_pilotPerson                  0 9 2342 19200300 100 4 4 */
 &(nid_objs[423]),/* OBJ_account                      0 9 2342 19200300 100 4 5 */
 &(nid_objs[424]),/* OBJ_document                     0 9 2342 19200300 100 4 6 */
 &(nid_objs[425]),/* OBJ_room                         0 9 2342 19200300 100 4 7 */
 &(nid_objs[426]),/* OBJ_documentSeries               0 9 2342 19200300 100 4 9 */
 &(nid_objs[392]),/* OBJ_Domain                       0 9 2342 19200300 100 4 13 */
 &(nid_objs[427]),/* OBJ_rFC822localPart              0 9 2342 19200300 100 4 14 */
 &(nid_objs[428]),/* OBJ_dNSDomain                    0 9 2342 19200300 100 4 15 */
 &(nid_objs[429]),/* OBJ_domainRelatedObject          0 9 2342 19200300 100 4 17 */
 &(nid_objs[430]),/* OBJ_friendlyCountry              0 9 2342 19200300 100 4 18 */
 &(nid_objs[431]),/* OBJ_simpleSecurityObject         0 9 2342 19200300 100 4 19 */
 &(nid_objs[432]),/* OBJ_pilotOrganization            0 9 2342 19200300 100 4 20 */
 &(nid_objs[433]),/* OBJ_pilotDSA                     0 9 2342 19200300 100 4 21 */
 &(nid_objs[434]),/* OBJ_qualityLabelledData          0 9 2342 19200300 100 4 22 */
 &(nid_objs[189]),/* OBJ_id_smime_mod                 1 2 840 113549 1 9 16 0 */
 &(nid_objs[190]),/* OBJ_id_smime_ct                  1 2 840 113549 1 9 16 1 */
 &(nid_objs[191]),/* OBJ_id_smime_aa                  1 2 840 113549 1 9 16 2 */
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@ -66,6 +66,11 @@
 #define NID_undef			0
 #define OBJ_undef			0L
 #define SN_ccitt		"CCITT"
 #define LN_ccitt		"ccitt"
 #define NID_ccitt		410
 #define OBJ_ccitt		0L
 #define SN_iso		"ISO"
 #define LN_iso		"iso"
 #define NID_iso		181
@ -1777,16 +1782,6 @@
 #define NID_dcObject		390
 #define OBJ_dcObject		OBJ_enterprises,1466L,344L
 #define SN_domainComponent		"DC"
 #define LN_domainComponent		"domainComponent"
 #define NID_domainComponent		391
 #define OBJ_domainComponent		0L,9L,2342L,19200300L,100L,1L,25L
 #define SN_Domain		"domain"
 #define LN_Domain		"Domain"
 #define NID_Domain		392
 #define OBJ_Domain		0L,9L,2342L,19200300L,100L,4L,13L
 #define SN_rle_compression		"RLE"
 #define LN_rle_compression		"run length compression"
 #define NID_rle_compression		124
@ -1885,3 +1880,288 @@
 #define NID_hold_instruction_reject		409
 #define OBJ_hold_instruction_reject		OBJ_holdInstruction,3L
 #define SN_data		"data"
 #define NID_data		411
 #define OBJ_data		OBJ_ccitt,9L
 #define SN_pss		"pss"
 #define NID_pss		412
 #define OBJ_pss		OBJ_data,2342L
 #define SN_ucl		"ucl"
 #define NID_ucl		413
 #define OBJ_ucl		OBJ_pss,19200300L
 #define SN_pilot		"pilot"
 #define NID_pilot		414
 #define OBJ_pilot		OBJ_ucl,100L
 #define LN_pilotAttributeType		"pilotAttributeType"
 #define NID_pilotAttributeType		415
 #define OBJ_pilotAttributeType		OBJ_pilot,1L
 #define LN_pilotAttributeSyntax		"pilotAttributeSyntax"
 #define NID_pilotAttributeSyntax		416
 #define OBJ_pilotAttributeSyntax		OBJ_pilot,3L
 #define LN_pilotObjectClass		"pilotObjectClass"
 #define NID_pilotObjectClass		417
 #define OBJ_pilotObjectClass		OBJ_pilot,4L
 #define LN_pilotGroups		"pilotGroups"
 #define NID_pilotGroups		418
 #define OBJ_pilotGroups		OBJ_pilot,10L
 #define LN_iA5StringSyntax		"iA5StringSyntax"
 #define NID_iA5StringSyntax		419
 #define OBJ_iA5StringSyntax		OBJ_pilotAttributeSyntax,4L
 #define LN_caseIgnoreIA5StringSyntax		"caseIgnoreIA5StringSyntax"
 #define NID_caseIgnoreIA5StringSyntax		420
 #define OBJ_caseIgnoreIA5StringSyntax		OBJ_pilotAttributeSyntax,5L
 #define LN_pilotObject		"pilotObject"
 #define NID_pilotObject		421
 #define OBJ_pilotObject		OBJ_pilotObjectClass,3L
 #define LN_pilotPerson		"pilotPerson"
 #define NID_pilotPerson		422
 #define OBJ_pilotPerson		OBJ_pilotObjectClass,4L
 #define SN_account		"account"
 #define NID_account		423
 #define OBJ_account		OBJ_pilotObjectClass,5L
 #define SN_document		"document"
 #define NID_document		424
 #define OBJ_document		OBJ_pilotObjectClass,6L
 #define SN_room		"room"
 #define NID_room		425
 #define OBJ_room		OBJ_pilotObjectClass,7L
 #define LN_documentSeries		"documentSeries"
 #define NID_documentSeries		426
 #define OBJ_documentSeries		OBJ_pilotObjectClass,9L
 #define SN_Domain		"domain"
 #define LN_Domain		"Domain"
 #define NID_Domain		392
 #define OBJ_Domain		OBJ_pilotObjectClass,13L
 #define LN_rFC822localPart		"rFC822localPart"
 #define NID_rFC822localPart		427
 #define OBJ_rFC822localPart		OBJ_pilotObjectClass,14L
 #define LN_dNSDomain		"dNSDomain"
 #define NID_dNSDomain		428
 #define OBJ_dNSDomain		OBJ_pilotObjectClass,15L
 #define LN_domainRelatedObject		"domainRelatedObject"
 #define NID_domainRelatedObject		429
 #define OBJ_domainRelatedObject		OBJ_pilotObjectClass,17L
 #define LN_friendlyCountry		"friendlyCountry"
 #define NID_friendlyCountry		430
 #define OBJ_friendlyCountry		OBJ_pilotObjectClass,18L
 #define LN_simpleSecurityObject		"simpleSecurityObject"
 #define NID_simpleSecurityObject		431
 #define OBJ_simpleSecurityObject		OBJ_pilotObjectClass,19L
 #define LN_pilotOrganization		"pilotOrganization"
 #define NID_pilotOrganization		432
 #define OBJ_pilotOrganization		OBJ_pilotObjectClass,20L
 #define LN_pilotDSA		"pilotDSA"
 #define NID_pilotDSA		433
 #define OBJ_pilotDSA		OBJ_pilotObjectClass,21L
 #define LN_qualityLabelledData		"qualityLabelledData"
 #define NID_qualityLabelledData		434
 #define OBJ_qualityLabelledData		OBJ_pilotObjectClass,22L
 #define SN_userid		"userid"
 #define NID_userid		435
 #define OBJ_userid		OBJ_pilotAttributeType,1L
 #define LN_textEncodedORAddress		"textEncodedORAddress"
 #define NID_textEncodedORAddress		436
 #define OBJ_textEncodedORAddress		OBJ_pilotAttributeType,2L
 #define LN_rfc822Mailbox		"rfc822Mailbox"
 #define NID_rfc822Mailbox		437
 #define OBJ_rfc822Mailbox		OBJ_pilotAttributeType,3L
 #define SN_info		"info"
 #define NID_info		438
 #define OBJ_info		OBJ_pilotAttributeType,4L
 #define LN_favouriteDrink		"favouriteDrink"
 #define NID_favouriteDrink		439
 #define OBJ_favouriteDrink		OBJ_pilotAttributeType,5L
 #define LN_roomNumber		"roomNumber"
 #define NID_roomNumber		440
 #define OBJ_roomNumber		OBJ_pilotAttributeType,6L
 #define SN_photo		"photo"
 #define NID_photo		441
 #define OBJ_photo		OBJ_pilotAttributeType,7L
 #define LN_userClass		"userClass"
 #define NID_userClass		442
 #define OBJ_userClass		OBJ_pilotAttributeType,8L
 #define SN_host		"host"
 #define NID_host		443
 #define OBJ_host		OBJ_pilotAttributeType,9L
 #define SN_manager		"manager"
 #define NID_manager		444
 #define OBJ_manager		OBJ_pilotAttributeType,10L
 #define LN_documentIdentifier		"documentIdentifier"
 #define NID_documentIdentifier		445
 #define OBJ_documentIdentifier		OBJ_pilotAttributeType,11L
 #define LN_documentTitle		"documentTitle"
 #define NID_documentTitle		446
 #define OBJ_documentTitle		OBJ_pilotAttributeType,12L
 #define LN_documentVersion		"documentVersion"
 #define NID_documentVersion		447
 #define OBJ_documentVersion		OBJ_pilotAttributeType,13L
 #define LN_documentAuthor		"documentAuthor"
 #define NID_documentAuthor		448
 #define OBJ_documentAuthor		OBJ_pilotAttributeType,14L
 #define LN_documentLocation		"documentLocation"
 #define NID_documentLocation		449
 #define OBJ_documentLocation		OBJ_pilotAttributeType,15L
 #define LN_homeTelephoneNumber		"homeTelephoneNumber"
 #define NID_homeTelephoneNumber		450
 #define OBJ_homeTelephoneNumber		OBJ_pilotAttributeType,20L
 #define SN_secretary		"secretary"
 #define NID_secretary		451
 #define OBJ_secretary		OBJ_pilotAttributeType,21L
 #define LN_otherMailbox		"otherMailbox"
 #define NID_otherMailbox		452
 #define OBJ_otherMailbox		OBJ_pilotAttributeType,22L
 #define LN_lastModifiedTime		"lastModifiedTime"
 #define NID_lastModifiedTime		453
 #define OBJ_lastModifiedTime		OBJ_pilotAttributeType,23L
 #define LN_lastModifiedBy		"lastModifiedBy"
 #define NID_lastModifiedBy		454
 #define OBJ_lastModifiedBy		OBJ_pilotAttributeType,24L
 #define SN_domainComponent		"DC"
 #define LN_domainComponent		"domainComponent"
 #define NID_domainComponent		391
 #define OBJ_domainComponent		OBJ_pilotAttributeType,25L
 #define LN_aRecord		"aRecord"
 #define NID_aRecord		455
 #define OBJ_aRecord		OBJ_pilotAttributeType,26L
 #define NID_		456
 #define OBJ_		OBJ_pilotAttributeType,27L
 #define LN_mXRecord		"mXRecord"
 #define NID_mXRecord		457
 #define OBJ_mXRecord		OBJ_pilotAttributeType,28L
 #define LN_nSRecord		"nSRecord"
 #define NID_nSRecord		458
 #define OBJ_nSRecord		OBJ_pilotAttributeType,29L
 #define LN_sOARecord		"sOARecord"
 #define NID_sOARecord		459
 #define OBJ_sOARecord		OBJ_pilotAttributeType,30L
 #define LN_cNAMERecord		"cNAMERecord"
 #define NID_cNAMERecord		460
 #define OBJ_cNAMERecord		OBJ_pilotAttributeType,31L
 #define LN_associatedDomain		"associatedDomain"
 #define NID_associatedDomain		461
 #define OBJ_associatedDomain		OBJ_pilotAttributeType,37L
 #define LN_associatedName		"associatedName"
 #define NID_associatedName		462
 #define OBJ_associatedName		OBJ_pilotAttributeType,38L
 #define LN_homePostalAddress		"homePostalAddress"
 #define NID_homePostalAddress		463
 #define OBJ_homePostalAddress		OBJ_pilotAttributeType,39L
 #define LN_personalTitle		"personalTitle"
 #define NID_personalTitle		464
 #define OBJ_personalTitle		OBJ_pilotAttributeType,40L
 #define LN_mobileTelephoneNumber		"mobileTelephoneNumber"
 #define NID_mobileTelephoneNumber		465
 #define OBJ_mobileTelephoneNumber		OBJ_pilotAttributeType,41L
 #define LN_pagerTelephoneNumber		"pagerTelephoneNumber"
 #define NID_pagerTelephoneNumber		466
 #define OBJ_pagerTelephoneNumber		OBJ_pilotAttributeType,42L
 #define LN_friendlyCountryName		"friendlyCountryName"
 #define NID_friendlyCountryName		467
 #define OBJ_friendlyCountryName		OBJ_pilotAttributeType,43L
 #define LN_organizationalStatus		"organizationalStatus"
 #define NID_organizationalStatus		468
 #define OBJ_organizationalStatus		OBJ_pilotAttributeType,45L
 #define LN_janetMailbox		"janetMailbox"
 #define NID_janetMailbox		469
 #define OBJ_janetMailbox		OBJ_pilotAttributeType,46L
 #define LN_mailPreferenceOption		"mailPreferenceOption"
 #define NID_mailPreferenceOption		470
 #define OBJ_mailPreferenceOption		OBJ_pilotAttributeType,47L
 #define LN_buildingName		"buildingName"
 #define NID_buildingName		471
 #define OBJ_buildingName		OBJ_pilotAttributeType,48L
 #define LN_dSAQuality		"dSAQuality"
 #define NID_dSAQuality		472
 #define OBJ_dSAQuality		OBJ_pilotAttributeType,49L
 #define LN_singleLevelQuality		"singleLevelQuality"
 #define NID_singleLevelQuality		473
 #define OBJ_singleLevelQuality		OBJ_pilotAttributeType,50L
 #define LN_subtreeMinimumQuality		"subtreeMinimumQuality"
 #define NID_subtreeMinimumQuality		474
 #define OBJ_subtreeMinimumQuality		OBJ_pilotAttributeType,51L
 #define LN_subtreeMaximumQuality		"subtreeMaximumQuality"
 #define NID_subtreeMaximumQuality		475
 #define OBJ_subtreeMaximumQuality		OBJ_pilotAttributeType,52L
 #define LN_personalSignature		"personalSignature"
 #define NID_personalSignature		476
 #define OBJ_personalSignature		OBJ_pilotAttributeType,53L
 #define LN_dITRedirect		"dITRedirect"
 #define NID_dITRedirect		477
 #define OBJ_dITRedirect		OBJ_pilotAttributeType,54L
 #define SN_audio		"audio"
 #define NID_audio		478
 #define OBJ_audio		OBJ_pilotAttributeType,55L
 #define LN_documentPublisher		"documentPublisher"
 #define NID_documentPublisher		479
 #define OBJ_documentPublisher		OBJ_pilotAttributeType,56L
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@ -407,3 +407,73 @@ hold_instruction_code		406
 hold_instruction_none		407
 hold_instruction_call_issuer		408
 hold_instruction_reject		409
 ccitt		410
 data		411
 pss		412
 ucl		413
 pilot		414
 pilotAttributeType		415
 pilotAttributeSyntax		416
 pilotObjectClass		417
 pilotGroups		418
 iA5StringSyntax		419
 caseIgnoreIA5StringSyntax		420
 pilotObject		421
 pilotPerson		422
 account		423
 document		424
 room		425
 documentSeries		426
 rFC822localPart		427
 dNSDomain		428
 domainRelatedObject		429
 friendlyCountry		430
 simpleSecurityObject		431
 pilotOrganization		432
 pilotDSA		433
 qualityLabelledData		434
 userid		435
 textEncodedORAddress		436
 rfc822Mailbox		437
 info		438
 favouriteDrink		439
 roomNumber		440
 photo		441
 userClass		442
 host		443
 manager		444
 documentIdentifier		445
 documentTitle		446
 documentVersion		447
 documentAuthor		448
 documentLocation		449
 homeTelephoneNumber		450
 secretary		451
 otherMailbox		452
 lastModifiedTime		453
 lastModifiedBy		454
 aRecord		455
 		456
 mXRecord		457
 nSRecord		458
 sOARecord		459
 cNAMERecord		460
 associatedDomain		461
 associatedName		462
 homePostalAddress		463
 personalTitle		464
 mobileTelephoneNumber		465
 pagerTelephoneNumber		466
 friendlyCountryName		467
 organizationalStatus		468
 janetMailbox		469
 mailPreferenceOption		470
 buildingName		471
 dSAQuality		472
 singleLevelQuality		473
 subtreeMinimumQuality		474
 subtreeMaximumQuality		475
 personalSignature		476
 dITRedirect		477
 audio		478
 documentPublisher		479
--- a/crypto/ocsp/Makefile.ssl
+++ b/crypto/ocsp/Makefile.ssl
@ -82,19 +82,18 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-ocsp_asn.o: ../../e_os.h ../../include/openssl/asn1.h
+ocsp_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-ocsp_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_asn.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+ocsp_asn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_asn.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+ocsp_asn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ocsp_asn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_asn.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+ocsp_asn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_asn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h
-ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_asn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_asn.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_asn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_asn.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_asn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_asn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_asn.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_asn.o: ../../include/openssl/opensslconf.h
 ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 ocsp_asn.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 ocsp_asn.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
@ -127,19 +126,18 @@ ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 ocsp_cl.o: ../cryptlib.h ocsp_cl.c
-ocsp_err.o: ../../e_os.h ../../include/openssl/asn1.h
+ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-ocsp_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+ocsp_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-ocsp_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-ocsp_err.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+ocsp_err.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+ocsp_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-ocsp_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ocsp_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-ocsp_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ocsp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_err.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_err.o: ../../include/openssl/opensslconf.h
 ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 ocsp_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 ocsp_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
@ -171,27 +169,27 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c
-ocsp_ht.o: ../../e_os.h ../../include/openssl/asn1.h
+ocsp_ht.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-ocsp_ht.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+ocsp_ht.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-ocsp_ht.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ocsp_ht.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-ocsp_ht.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+ocsp_ht.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ocsp_ht.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+ocsp_ht.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-ocsp_ht.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ocsp_ht.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-ocsp_ht.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ocsp_ht.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_ht.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_ht.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_ht.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_ht.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_ht.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_ht.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_ht.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_ht.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_ht.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+ocsp_ht.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_ht.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_ht.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+ocsp_ht.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-ocsp_ht.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+ocsp_ht.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-ocsp_ht.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+ocsp_ht.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-ocsp_ht.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+ocsp_ht.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ocsp_ht.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ocsp_ht.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ocsp_ht.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c
+ocsp_ht.o: ocsp_ht.c
 ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 ocsp_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 ocsp_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@ -215,19 +213,18 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c
-ocsp_prn.o: ../../e_os.h ../../include/openssl/asn1.h
+ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-ocsp_prn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+ocsp_prn.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-ocsp_prn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-ocsp_prn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+ocsp_prn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+ocsp_prn.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-ocsp_prn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ocsp_prn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-ocsp_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ocsp_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_prn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_prn.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_prn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_prn.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_prn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_prn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_prn.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_prn.o: ../../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/rc2.h ../../include/openssl/rc4.h
@ -261,19 +258,18 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c
-ocsp_vfy.o: ../../e_os.h ../../include/openssl/asn1.h
+ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-ocsp_vfy.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+ocsp_vfy.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-ocsp_vfy.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-ocsp_vfy.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+ocsp_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+ocsp_vfy.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-ocsp_vfy.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ocsp_vfy.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-ocsp_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ocsp_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_vfy.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_vfy.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_vfy.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_vfy.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_vfy.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_vfy.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
+ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_vfy.o: ../../include/openssl/opensslconf.h
 ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 ocsp_vfy.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 ocsp_vfy.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@ -102,27 +102,26 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 pem_all.o: ../cryptlib.h pem_all.c
-pem_err.o: ../../e_os.h ../../include/openssl/asn1.h
+pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-pem_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+pem_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pem_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-pem_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pem_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+pem_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-pem_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+pem_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-pem_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-pem_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+pem_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-pem_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+pem_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-pem_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pem_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-pem_err.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+pem_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-pem_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+pem_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-pem_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+pem_err.o: ../../include/openssl/x509_vfy.h pem_err.c
 pem_err.o: pem_err.c
 pem_info.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@ -293,18 +293,17 @@ 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/x509.h
 p12_mutl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_mutl.c
-p12_npas.o: ../../e_os.h ../../include/openssl/asn1.h
+p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-p12_npas.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+p12_npas.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-p12_npas.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-p12_npas.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+p12_npas.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-p12_npas.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+p12_npas.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-p12_npas.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+p12_npas.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p12_npas.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-p12_npas.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+p12_npas.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-p12_npas.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_npas.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-p12_npas.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_npas.o: ../../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/rc2.h
@ -335,23 +334,23 @@ 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/x509.h
 p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_utl.c
-pk12err.o: ../../e_os.h ../../include/openssl/asn1.h
+pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-pk12err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+pk12err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pk12err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-pk12err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pk12err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pk12err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+pk12err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-pk12err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+pk12err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-pk12err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-pk12err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+pk12err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-pk12err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+pk12err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-pk12err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk12err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+pk12err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-pk12err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+pk12err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pk12err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+pk12err.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
-pk12err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pk12err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pk12err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk12err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk12err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pk12err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk12err.o: ../../include/openssl/x509_vfy.h pk12err.c
+pk12err.o: pk12err.c
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@ -121,18 +121,17 @@ 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/x509.h
 pk7_asn1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_asn1.c
-pk7_attr.o: ../../e_os.h ../../include/openssl/asn1.h
+pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-pk7_attr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+pk7_attr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pk7_attr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+pk7_attr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-pk7_attr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pk7_attr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pk7_attr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+pk7_attr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-pk7_attr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-pk7_attr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-pk7_attr.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+pk7_attr.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-pk7_attr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+pk7_attr.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-pk7_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pk7_attr.o: ../../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/rc2.h ../../include/openssl/rc4.h
@ -226,18 +225,17 @@ pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 pk7_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 pk7_smime.o: ../cryptlib.h pk7_smime.c
-pkcs7err.o: ../../e_os.h ../../include/openssl/asn1.h
+pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-pkcs7err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+pkcs7err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pkcs7err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+pkcs7err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-pkcs7err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pkcs7err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pkcs7err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+pkcs7err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-pkcs7err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+pkcs7err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-pkcs7err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+pkcs7err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-pkcs7err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pkcs7err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-pkcs7err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+pkcs7err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-pkcs7err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+pkcs7err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-pkcs7err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pkcs7err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pkcs7err.o: ../../include/openssl/opensslconf.h
 pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 pkcs7err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 pkcs7err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@ -97,17 +97,16 @@ 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 rand_err.c
-rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+rand_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rand_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-rand_lib.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+rand_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+rand_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-rand_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+rand_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+rand_lib.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
-rand_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+rand_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-rand_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+rand_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-rand_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rand_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-rand_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 rand_lib.o: ../../include/openssl/opensslconf.h
 rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 rand_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 rand_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@ -93,14 +93,13 @@ 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 ../cryptlib.h rsa_asn1.c
-rsa_chk.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_chk.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_chk.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rsa_chk.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rsa_chk.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_chk.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_chk.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_chk.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_chk.o: ../../include/openssl/symhacks.h rsa_chk.c
 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/blowfish.h
 rsa_eay.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@ -120,14 +119,13 @@ rsa_eay.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_eay.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c
-rsa_err.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rsa_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_err.o: ../../include/openssl/symhacks.h rsa_err.c
 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
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@ -212,18 +212,17 @@ 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/x509.h
 x509_def.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_def.c
-x509_err.o: ../../e_os.h ../../include/openssl/asn1.h
+x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-x509_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+x509_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-x509_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+x509_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-x509_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+x509_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-x509_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+x509_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-x509_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+x509_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x509_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-x509_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+x509_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-x509_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x509_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-x509_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x509_err.o: ../../include/openssl/opensslconf.h
 x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 x509_err.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@ -525,7 +525,7 @@ 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/x509.h ../../include/openssl/x509_vfy.h
 v3_utl.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_utl.c
-v3err.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 v3err.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@ -99,7 +99,7 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-bio_ssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+bio_ssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 bio_ssl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 bio_ssl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 bio_ssl.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@ -638,7 +638,7 @@ 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: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+ssl_err.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_err.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 ssl_err.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 ssl_err.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@ -661,7 +661,7 @@ 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: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+ssl_err2.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_err2.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 ssl_err2.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 ssl_err2.o: ../include/openssl/comp.h ../include/openssl/crypto.h
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@ -379,7 +379,7 @@ 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/safestack.h
 dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dsatest.c
-enginetest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 enginetest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 enginetest.o: ../include/openssl/cast.h ../include/openssl/crypto.h
 enginetest.o: ../include/openssl/des.h ../include/openssl/dh.h
@ -403,7 +403,7 @@ 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.c
-hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 hmactest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 hmactest.o: ../include/openssl/cast.h ../include/openssl/crypto.h
 hmactest.o: ../include/openssl/des.h ../include/openssl/dh.h
--- a/util/libeay.num
+++ b/util/libeay.num
@ -196,8 +196,8 @@ DH_generate_key                         203	EXIST::FUNCTION:DH
 DH_generate_parameters                  204	EXIST::FUNCTION:DH
 DH_new                                  205	EXIST::FUNCTION:DH
 DH_size                                 206	EXIST::FUNCTION:DH
-DHparams_print                          207	EXIST::FUNCTION:DH,BIO
+DHparams_print                          207	EXIST::FUNCTION:BIO,DH
-DHparams_print_fp                       208	EXIST::FUNCTION:FP_API,DH
+DHparams_print_fp                       208	EXIST::FUNCTION:DH,FP_API
 DSA_free                                209	EXIST::FUNCTION:DSA
 DSA_generate_key                        210	EXIST::FUNCTION:DSA
 DSA_generate_parameters                 211	EXIST::FUNCTION:DSA
@ -301,8 +301,8 @@ EVP_des_ede_cfb                         308	EXIST::FUNCTION:DES
 EVP_des_ede_ofb                         309	EXIST::FUNCTION:DES
 EVP_des_ofb                             310	EXIST::FUNCTION:DES
 EVP_desx_cbc                            311	EXIST::FUNCTION:DES
-EVP_dss                                 312	EXIST::FUNCTION:SHA,DSA
+EVP_dss                                 312	EXIST::FUNCTION:DSA,SHA
-EVP_dss1                                313	EXIST::FUNCTION:SHA,DSA
+EVP_dss1                                313	EXIST::FUNCTION:DSA,SHA
 EVP_enc_null                            314	EXIST::FUNCTION:
 EVP_get_cipherbyname                    315	EXIST::FUNCTION:
 EVP_get_digestbyname                    316	EXIST::FUNCTION:
@ -477,8 +477,8 @@ RSA_free                                484	EXIST::FUNCTION:RSA
 RSA_generate_key                        485	EXIST::FUNCTION:RSA
 RSA_new                                 486	EXIST::FUNCTION:RSA
 RSA_new_method                          487	EXIST::FUNCTION:RSA
-RSA_print                               488	EXIST::FUNCTION:RSA,BIO
+RSA_print                               488	EXIST::FUNCTION:BIO,RSA
-RSA_print_fp                            489	EXIST::FUNCTION:FP_API,RSA
+RSA_print_fp                            489	EXIST::FUNCTION:RSA,FP_API
 RSA_private_decrypt                     490	EXIST::FUNCTION:RSA
 RSA_private_encrypt                     491	EXIST::FUNCTION:RSA
 RSA_public_decrypt                      492	EXIST::FUNCTION:RSA
@ -489,14 +489,14 @@ RSA_sign_ASN1_OCTET_STRING              496	EXIST::FUNCTION:RSA
 RSA_size                                497	EXIST::FUNCTION:RSA
 RSA_verify                              498	EXIST::FUNCTION:RSA
 RSA_verify_ASN1_OCTET_STRING            499	EXIST::FUNCTION:RSA
-SHA                                     500	EXIST::FUNCTION:SHA,SHA0
+SHA                                     500	EXIST::FUNCTION:SHA0,SHA
 SHA1                                    501	EXIST::FUNCTION:SHA,SHA1
 SHA1_Final                              502	EXIST::FUNCTION:SHA,SHA1
 SHA1_Init                               503	EXIST::FUNCTION:SHA,SHA1
 SHA1_Update                             504	EXIST::FUNCTION:SHA,SHA1
-SHA_Final                               505	EXIST::FUNCTION:SHA,SHA0
+SHA_Final                               505	EXIST::FUNCTION:SHA0,SHA
-SHA_Init                                506	EXIST::FUNCTION:SHA,SHA0
+SHA_Init                                506	EXIST::FUNCTION:SHA0,SHA
-SHA_Update                              507	EXIST::FUNCTION:SHA,SHA0
+SHA_Update                              507	EXIST::FUNCTION:SHA0,SHA
 OpenSSL_add_all_algorithms              508	EXIST::FUNCTION:
 OpenSSL_add_all_ciphers                 509	EXIST::FUNCTION:
 OpenSSL_add_all_digests                 510	EXIST::FUNCTION:
@ -741,8 +741,8 @@ d2i_PKCS7_fp                            747	EXIST::FUNCTION:FP_API
 d2i_PrivateKey                          748	EXIST::FUNCTION:
 d2i_PublicKey                           749	EXIST::FUNCTION:
 d2i_RSAPrivateKey                       750	EXIST::FUNCTION:RSA
-d2i_RSAPrivateKey_bio                   751	EXIST::FUNCTION:RSA,BIO
+d2i_RSAPrivateKey_bio                   751	EXIST::FUNCTION:BIO,RSA
-d2i_RSAPrivateKey_fp                    752	EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPrivateKey_fp                    752	EXIST::FUNCTION:RSA,FP_API
 d2i_RSAPublicKey                        753	EXIST::FUNCTION:RSA
 d2i_X509                                754	EXIST::FUNCTION:
 d2i_X509_ALGOR                          755	EXIST::FUNCTION:
@ -843,8 +843,8 @@ i2d_PKCS7_fp                            850	EXIST::FUNCTION:FP_API
 i2d_PrivateKey                          851	EXIST::FUNCTION:
 i2d_PublicKey                           852	EXIST::FUNCTION:
 i2d_RSAPrivateKey                       853	EXIST::FUNCTION:RSA
-i2d_RSAPrivateKey_bio                   854	EXIST::FUNCTION:RSA,BIO
+i2d_RSAPrivateKey_bio                   854	EXIST::FUNCTION:BIO,RSA
-i2d_RSAPrivateKey_fp                    855	EXIST::FUNCTION:FP_API,RSA
+i2d_RSAPrivateKey_fp                    855	EXIST::FUNCTION:RSA,FP_API
 i2d_RSAPublicKey                        856	EXIST::FUNCTION:RSA
 i2d_X509                                857	EXIST::FUNCTION:
 i2d_X509_ALGOR                          858	EXIST::FUNCTION:
@ -929,12 +929,12 @@ EVP_delete_alias                        941	NOEXIST::FUNCTION:
 EVP_mdc2                                942	EXIST::FUNCTION:MDC2
 PEM_read_bio_RSAPublicKey               943	EXIST::FUNCTION:RSA
 PEM_write_bio_RSAPublicKey              944	EXIST::FUNCTION:RSA
-d2i_RSAPublicKey_bio                    945	EXIST::FUNCTION:RSA,BIO
+d2i_RSAPublicKey_bio                    945	EXIST::FUNCTION:BIO,RSA
-i2d_RSAPublicKey_bio                    946	EXIST::FUNCTION:RSA,BIO
+i2d_RSAPublicKey_bio                    946	EXIST::FUNCTION:BIO,RSA
 PEM_read_RSAPublicKey                   947	EXIST:!WIN16:FUNCTION:RSA
 PEM_write_RSAPublicKey                  949	EXIST:!WIN16:FUNCTION:RSA
-d2i_RSAPublicKey_fp                     952	EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPublicKey_fp                     952	EXIST::FUNCTION:RSA,FP_API
-i2d_RSAPublicKey_fp                     954	EXIST::FUNCTION:FP_API,RSA
+i2d_RSAPublicKey_fp                     954	EXIST::FUNCTION:RSA,FP_API
 BIO_copy_next_retry                     955	EXIST::FUNCTION:
 RSA_flags                               956	EXIST::FUNCTION:RSA
 X509_STORE_add_crl                      957	EXIST::FUNCTION:
@ -989,7 +989,7 @@ ERR_load_CRYPTOlib_strings              1009	EXIST:WIN16,VMS:FUNCTION:
 EVP_PKEY_bits                           1010	EXIST::FUNCTION:
 MD5_Transform                           1011	EXIST::FUNCTION:MD5
 SHA1_Transform                          1012	EXIST::FUNCTION:SHA,SHA1
-SHA_Transform                           1013	EXIST::FUNCTION:SHA,SHA0
+SHA_Transform                           1013	EXIST::FUNCTION:SHA0,SHA
 X509_STORE_CTX_get_chain                1014	EXIST::FUNCTION:
 X509_STORE_CTX_get_current_cert         1015	EXIST::FUNCTION:
 X509_STORE_CTX_get_error                1016	EXIST::FUNCTION:
@ -1216,7 +1216,7 @@ name_cmp                                1239	EXIST::FUNCTION:
 str_dup                                 1240	NOEXIST::FUNCTION:
 i2s_ASN1_ENUMERATED                     1241	EXIST::FUNCTION:
 i2s_ASN1_ENUMERATED_TABLE               1242	EXIST::FUNCTION:
-BIO_s_log                               1243	EXIST:!WIN16,!WIN32,!macintosh:FUNCTION:
+BIO_s_log                               1243	EXIST:!WIN32,!WIN16,!macintosh:FUNCTION:
 BIO_f_reliable                          1244	EXIST::FUNCTION:BIO
 PKCS7_dataFinal                         1245	EXIST::FUNCTION:
 PKCS7_dataDecode                        1246	EXIST::FUNCTION:
@ -1543,7 +1543,7 @@ ASN1_STRING_set_default_mask_asc        1960	EXIST:!VMS:FUNCTION:
 ASN1_STRING_set_def_mask_asc            1960	EXIST:VMS:FUNCTION:
 PEM_write_bio_RSA_PUBKEY                1961	EXIST::FUNCTION:RSA
 ASN1_INTEGER_cmp                        1963	EXIST::FUNCTION:
-d2i_RSA_PUBKEY_fp                       1964	EXIST::FUNCTION:FP_API,RSA
+d2i_RSA_PUBKEY_fp                       1964	EXIST::FUNCTION:RSA,FP_API
 X509_trust_set_bit_asc                  1967	NOEXIST::FUNCTION:
 PEM_write_bio_DSA_PUBKEY                1968	EXIST::FUNCTION:DSA
 X509_STORE_CTX_free                     1969	EXIST::FUNCTION:
@ -1558,7 +1558,7 @@ d2i_X509_AUX                            1980	EXIST::FUNCTION:
 i2d_DSA_PUBKEY                          1981	EXIST::FUNCTION:DSA
 X509_CERT_AUX_print                     1982	EXIST::FUNCTION:BIO
 PEM_read_DSA_PUBKEY                     1984	EXIST:!WIN16:FUNCTION:DSA
-i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:RSA,BIO
+i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:BIO,RSA
 ASN1_BIT_STRING_num_asc                 1986	EXIST::FUNCTION:
 i2d_PUBKEY                              1987	EXIST::FUNCTION:
 ASN1_UTCTIME_free                       1988	EXIST::FUNCTION:
@ -1606,7 +1606,7 @@ ASN1_IA5STRING_new                      2049	EXIST::FUNCTION:
 d2i_DSA_PUBKEY                          2050	EXIST::FUNCTION:DSA
 X509_check_purpose                      2051	EXIST::FUNCTION:
 ASN1_ENUMERATED_new                     2052	EXIST::FUNCTION:
-d2i_RSA_PUBKEY_bio                      2053	EXIST::FUNCTION:RSA,BIO
+d2i_RSA_PUBKEY_bio                      2053	EXIST::FUNCTION:BIO,RSA
 d2i_PUBKEY                              2054	EXIST::FUNCTION:
 X509_TRUST_get_trust                    2055	EXIST::FUNCTION:
 X509_TRUST_get_flags                    2056	EXIST::FUNCTION:
@ -1646,7 +1646,7 @@ ASN1_BIT_STRING_set                     2109	EXIST::FUNCTION:
 X509_TRUST_get_count                    2110	EXIST::FUNCTION:
 ASN1_INTEGER_free                       2111	EXIST::FUNCTION:
 OTHERNAME_free                          2112	EXIST::FUNCTION:
-i2d_RSA_PUBKEY_fp                       2113	EXIST::FUNCTION:FP_API,RSA
+i2d_RSA_PUBKEY_fp                       2113	EXIST::FUNCTION:RSA,FP_API
 ASN1_INTEGER_dup                        2114	EXIST::FUNCTION:
 d2i_X509_CERT_AUX                       2115	EXIST::FUNCTION:
 PEM_write_bio_PUBKEY                    2117	EXIST::FUNCTION:
@ -2259,7 +2259,7 @@ OCSP_RESPONSE_it                        2835	EXIST::VARIABLE:
 OCSP_CERTSTATUS_it                      2836	EXIST::VARIABLE:
 OCSP_basic_sign                         2837	EXIST::FUNCTION:
 OCSP_request_onereq_get0                2838	EXIST::FUNCTION:
-ASN1_SEQUENCE_it                        2839	EXIST::VARIABLE:
+ASN1_SEQUENCE_it                        2839	NOEXIST::FUNCTION:
 OCSP_crl_reason_str                     2840	EXIST::FUNCTION:
 OCSP_request_set1_name                  2841	EXIST::FUNCTION:
 OCSP_cert_to_id                         2842	EXIST::FUNCTION:
@ -2273,7 +2273,7 @@ CRYPTO_get_mem_ex_functions             2849	EXIST::FUNCTION:
 OPENSSL_issetugid                       2850	EXIST::FUNCTION:
 PKCS12_item_i2d_encrypt                 2851	EXIST::FUNCTION:
 OCSP_basic_verify                       2852	EXIST::FUNCTION:
-ZLONG_it                                2853	EXIST::VARIABLE:
+ZLONG_it                                2853	NOEXIST::FUNCTION:
 EVP_aes_128_ecb                         2854	EXIST::FUNCTION:AES
 CRYPTO_set_locked_mem_ex_functions      2855	EXIST:!VMS:FUNCTION:
 CRYPTO_set_locked_mem_ex_funcs          2855	EXIST:VMS:FUNCTION:
@ -2282,7 +2282,7 @@ DIRECTORYSTRING_it                      2857	EXIST::VARIABLE:
 PKCS12_decrypt_skey                     2858	EXIST::FUNCTION:
 EVP_aes_192_cbc                         2859	EXIST::FUNCTION:AES
 OCSP_id_get0_info                       2860	EXIST::FUNCTION:
-ASN1_FBOOLEAN_it                        2861	EXIST::VARIABLE:
+ASN1_FBOOLEAN_it                        2861	NOEXIST::FUNCTION:
 OCSP_id_issuer_cmp                      2862	EXIST::FUNCTION:
 RAND_query_egd_bytes                    2863	EXIST::FUNCTION:
 ASN1_TIME_check                         2864	EXIST::FUNCTION:
@ -2318,11 +2318,11 @@ X509_get0_pubkey_bitstr                 2893	EXIST::FUNCTION:
 OCSP_cert_status_str                    2894	EXIST::FUNCTION:
 OCSP_sendreq_bio                        2895	EXIST::FUNCTION:
 ASN1_item_i2d_bio                       2896	EXIST::FUNCTION:BIO
-CBIGNUM_it                              2897	EXIST::VARIABLE:
+CBIGNUM_it                              2897	NOEXIST::FUNCTION:
 PKCS8_decrypt                           2898	EXIST::FUNCTION:
 rijndaelKeySetupEnc                     2899	EXIST::FUNCTION:
 OCSP_basic_add1_cert                    2900	EXIST::FUNCTION:
-LONG_it                                 2901	EXIST::VARIABLE:
+LONG_it                                 2901	NOEXIST::FUNCTION:
 PKCS12_certbag2x509                     2902	EXIST::FUNCTION:
 OCSP_response_create                    2903	EXIST::FUNCTION:
 OCSP_resp_get0                          2904	EXIST::FUNCTION:
@ -2332,16 +2332,17 @@ EVP_aes_192_ecb                         2906	EXIST::FUNCTION:AES
 OCSP_response_get1_basic                2907	EXIST::FUNCTION:
 PKCS12_item_pack_safebag                2908	EXIST::FUNCTION:
 OCSP_copy_nonce                         2909	EXIST::FUNCTION:
-ASN1_TBOOLEAN_it                        2910	EXIST::VARIABLE:
+ASN1_TBOOLEAN_it                        2910	NOEXIST::FUNCTION:
 OCSP_single_get0_status                 2911	EXIST::FUNCTION:
 OCSP_check_nonce                        2912	EXIST::FUNCTION:
-ASN1_BOOLEAN_it                         2913	EXIST::VARIABLE:
+ASN1_BOOLEAN_it                         2913	NOEXIST::FUNCTION:
 RSAPublicKey_it                         2914	EXIST::VARIABLE:RSA
 ASN1_PRINTABLE_free                     2915	EXIST::FUNCTION:
 CRYPTO_set_mem_ex_functions             2916	EXIST::FUNCTION:
 ASN1_TIME_to_generalizedtime            2917	EXIST::FUNCTION:
-BIGNUM_it                               2918	EXIST::VARIABLE:
+BIGNUM_it                               2918	NOEXIST::FUNCTION:
 OCSP_onereq_get0_id                     2919	EXIST::FUNCTION:
 EVP_aes_256_cbc                         2920	EXIST::FUNCTION:AES
 OCSP_resp_find                          2921	EXIST::FUNCTION:
 BN_rand_range                           2922	EXIST::FUNCTION:
 OCSP_check_validity                     2923	EXIST::FUNCTION:
--- a/util/ssleay.num
+++ b/util/ssleay.num
@ -211,3 +211,4 @@ kssl_ctx_setstring                      260	EXIST::FUNCTION:KRB5
 SSL_CTX_has_matching_session_id         261	EXIST::FUNCTION:
 SSL_set_generate_session_id             262	EXIST::FUNCTION:
 SSL_CTX_set_generate_session_id         263	EXIST::FUNCTION:
 SSL_has_matching_session_id             264	EXIST::FUNCTION: