"make update" plus a rewrite of both .num files.

3 files changed, 93 insertions, 114 deletions

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 7bb2a5ca99..7e454bafb1 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -27,9 +27,9 @@ LIBS=
 
 SDIRS=	md2 md5 sha mdc2 hmac ripemd \
 	des rc2 rc4 rc5 idea bf cast \
-	bn rsa dsa dh dso engine \
+	bn rsa dsa dh dso engine rijndael \
 	buffer bio stack lhash rand err objects \
-	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp rijndael
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp
 
 GENERAL=Makefile README crypto-lib.com install.com
 
diff --git a/crypto/ocsp/Makefile.ssl b/crypto/ocsp/Makefile.ssl
index 6697a15333..b30cd58405 100644
--- a/crypto/ocsp/Makefile.ssl
+++ b/crypto/ocsp/Makefile.ssl
@@ -81,27 +81,27 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-ocsp_cid.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_cid.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_cid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_cid.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_cid.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_cid.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_cid.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-ocsp_cid.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_cid.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_cid.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_cid.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_cid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_cid.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_cid.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_cid.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-ocsp_cid.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-ocsp_cid.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-ocsp_cid.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_cid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_cid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ocsp_cid.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+ocsp_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+ocsp_asn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ocsp_asn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+ocsp_asn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+ocsp_asn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ocsp_asn.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_asn.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_asn.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_asn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_asn.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.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
+ocsp_asn.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+ocsp_asn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ocsp_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -123,20 +123,19 @@ ocsp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_ext.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_ext.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_ext.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_ext.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_ext.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_ext.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_ext.o: ../../include/openssl/e_os.h ../../include/openssl/e_os.h
-ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-ocsp_ext.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-ocsp_ext.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-ocsp_ext.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
-ocsp_ext.o: ../../include/openssl/opensslconf.h
+ocsp_ext.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ocsp_ext.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+ocsp_ext.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ocsp_ext.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+ocsp_ext.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+ocsp_ext.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ocsp_ext.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+ocsp_ext.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+ocsp_ext.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+ocsp_ext.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ocsp_ext.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 ocsp_ext.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
 ocsp_ext.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
@@ -146,20 +145,19 @@ ocsp_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 ocsp_ext.o: ../cryptlib.h
-ocsp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_lib.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os.h
-ocsp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-ocsp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-ocsp_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-ocsp_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-ocsp_lib.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
-ocsp_lib.o: ../../include/openssl/opensslconf.h
+ocsp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ocsp_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+ocsp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+ocsp_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ocsp_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+ocsp_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+ocsp_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+ocsp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ocsp_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+ocsp_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+ocsp_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+ocsp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ocsp_lib.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
 ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 ocsp_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 ocsp_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
@@ -170,66 +168,25 @@ ocsp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ocsp_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 ocsp_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
 ocsp_lib.o: ../cryptlib.h
-ocsp_req.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_req.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_req.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_req.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_req.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-ocsp_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_req.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_req.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_req.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-ocsp_req.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-ocsp_req.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-ocsp_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ocsp_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_res.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_res.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_res.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_res.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_res.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_res.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_res.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-ocsp_res.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_res.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_res.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_res.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_res.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_res.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_res.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_res.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-ocsp_res.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-ocsp_res.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-ocsp_res.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_res.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_res.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ocsp_res.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-ocsp_sig.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
-ocsp_sig.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-ocsp_sig.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-ocsp_sig.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-ocsp_sig.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ocsp_sig.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ocsp_sig.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-ocsp_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ocsp_sig.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-ocsp_sig.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-ocsp_sig.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-ocsp_sig.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-ocsp_sig.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
-ocsp_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-ocsp_sig.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-ocsp_sig.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
-ocsp_sig.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
-ocsp_sig.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ocsp_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ocsp_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ocsp_sig.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ocsp_prn.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+ocsp_prn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ocsp_prn.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+ocsp_prn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+ocsp_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+ocsp_prn.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+ocsp_prn.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+ocsp_prn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+ocsp_prn.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.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
+ocsp_prn.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+ocsp_prn.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+ocsp_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl
index c5cd578d0d..dc0a090e24 100644
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -387,6 +387,28 @@ v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 v3_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ext_dat.h
+v3_ocsp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+v3_ocsp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+v3_ocsp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_ocsp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+v3_ocsp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+v3_ocsp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+v3_ocsp.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+v3_ocsp.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+v3_ocsp.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+v3_ocsp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+v3_ocsp.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
+v3_ocsp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+v3_ocsp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+v3_ocsp.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+v3_ocsp.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_ocsp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_ocsp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_ocsp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_ocsp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_ocsp.o: ../cryptlib.h
 v3_pku.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 v3_pku.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_pku.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h