Make update to bring in all the cipher/digest-related ENGINE changes.

NB: It looks like mkdef.pl is causing certain cvs wars by continually
flipping the order of some definitions ...

diff --git a/util/libeay.num b/util/libeay.num
index d6e48afb3616ae5cef2f31237dec4119a8828350..a6adccfc8058874a68649227b9df35d520455933 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -984,8 +984,8 @@ BIO_ghbn_ctrl                           1003        EXIST::FUNCTION:
 CRYPTO_free_ex_data                     1004   EXIST::FUNCTION:
 CRYPTO_get_ex_data                      1005   EXIST::FUNCTION:
 CRYPTO_set_ex_data                      1007   EXIST::FUNCTION:
-ERR_load_CRYPTO_strings                 1009   NOEXIST::FUNCTION:
 ERR_load_CRYPTOlib_strings              1009   NOEXIST::FUNCTION:
+ERR_load_CRYPTO_strings                 1009   NOEXIST::FUNCTION:
 EVP_PKEY_bits                           1010   EXIST::FUNCTION:
 MD5_Transform                           1011   EXIST::FUNCTION:MD5
 SHA1_Transform                          1012   EXIST::FUNCTION:SHA,SHA1
@@ -1902,8 +1902,8 @@ X509V3_EXT_nconf                        2480      EXIST::FUNCTION:
 ASN1_GENERALSTRING_free                 2481   EXIST::FUNCTION:
 d2i_OCSP_CERTSTATUS                     2482   EXIST::FUNCTION:
 ENGINE_by_id                            2483   EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp_crt       2484   NOEXIST::FUNCTION:
 ENGINE_get_def_BN_mod_exp_crt           2484   NOEXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2484   NOEXIST::FUNCTION:
 X509_REVOKED_set_serialNumber           2485   EXIST::FUNCTION:
 X509_print_ex                           2486   EXIST::FUNCTION:BIO
 OCSP_ONEREQ_get1_ext_d2i                2487   EXIST::FUNCTION:
@@ -2016,7 +2016,7 @@ X509_REVOKED_it                         2576      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 ASN1_STRING_encode                      2577   EXIST::FUNCTION:
 EVP_aes_128_ecb                         2578   EXIST::FUNCTION:AES
 KRB5_AUTHENT_free                       2579   EXIST::FUNCTION:
-EVP_dev_crypto_md5                      2580   EXIST::FUNCTION:DES
+EVP_dev_crypto_md5                      2580   NOEXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_by_critical      2581   EXIST:!VMS:FUNCTION:
 OCSP_BASICRESP_get_ext_by_crit          2581   EXIST:VMS:FUNCTION:
 OCSP_cert_status_str                    2582   EXIST::FUNCTION:
@@ -2149,7 +2149,7 @@ PBE2PARAM_it                            2684      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 PKCS12_certbag2x509crl                  2685   EXIST::FUNCTION:
 PKCS7_SIGNED_it                         2686   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_SIGNED_it                         2686   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_cipher                       2687   NOEXIST::FUNCTION:
+ENGINE_get_cipher                       2687   EXIST::FUNCTION:
 i2d_OCSP_CRLID                          2688   EXIST::FUNCTION:
 OCSP_SINGLERESP_new                     2689   EXIST::FUNCTION:
 ENGINE_cmd_is_executable                2690   EXIST::FUNCTION:
@@ -2190,7 +2190,7 @@ ASN1_BMPSTRING_it                       2717      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_BMPSTRING_it                       2717   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_tag2bit                            2718   EXIST::FUNCTION:
 ENGINE_set_init_function                2719   EXIST::FUNCTION:
-ENGINE_add_cipher                       2720   EXIST::FUNCTION:
+ENGINE_add_cipher                       2720   NOEXIST::FUNCTION:
 UI_method_set_flusher                   2721   EXIST::FUNCTION:
 X509_ocspid_print                       2722   EXIST::FUNCTION:BIO
 KRB5_ENCDATA_it                         2723   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2291,7 +2291,7 @@ OCSP_SINGLERESP_delete_ext              2799      EXIST::FUNCTION:
 PKCS12_SAFEBAGS_it                      2800   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_SAFEBAGS_it                      2800   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 d2i_OCSP_SIGNATURE                      2801   EXIST::FUNCTION:
-EVP_dev_crypto_rc4                      2802   EXIST::FUNCTION:DES
+EVP_dev_crypto_rc4                      2802   NOEXIST::FUNCTION:
 OCSP_request_add1_nonce                 2803   EXIST::FUNCTION:
 ENGINE_set_cmd_defns                    2804   EXIST::FUNCTION:
 OCSP_SERVICELOC_free                    2805   EXIST::FUNCTION:
@@ -2339,14 +2339,14 @@ ENGINE_get_flags                        2841    EXIST::FUNCTION:
 OCSP_ONEREQ_it                          2842   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_ONEREQ_it                          2842   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_process                              2843   EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp_crt       2844   NOEXIST::FUNCTION:
 ENGINE_set_def_BN_mod_exp_crt           2844   NOEXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2844   NOEXIST::FUNCTION:
 ASN1_INTEGER_it                         2845   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_INTEGER_it                         2845   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ENGINE_get_name                         2846   EXIST::FUNCTION:
 UI_get_string_type                      2847   EXIST::FUNCTION:
 ENGINE_set_default_DSA                  2848   EXIST::FUNCTION:
-EVP_dev_crypto_des_ede3_cbc             2849   EXIST::FUNCTION:DES
+EVP_dev_crypto_des_ede3_cbc             2849   NOEXIST::FUNCTION:
 OCSP_ONEREQ_get_ext_by_critical         2850   EXIST::FUNCTION:
 bn_dup_expand                           2851   EXIST::FUNCTION:
 OCSP_cert_id_new                        2852   EXIST::FUNCTION:
@@ -2675,3 +2675,22 @@ ENGINE_unregister_RAND                  3123     EXIST::FUNCTION:
 ENGINE_set_table_flags                  3124   EXIST::FUNCTION:
 ENGINE_get_table_flags                  3125   EXIST::FUNCTION:
 RAND_set_rand_engine                    3126   EXIST::FUNCTION:
+ENGINE_unregister_ciphers               3127   EXIST::FUNCTION:
+ENGINE_get_ciphers                      3128   EXIST::FUNCTION:
+ENGINE_get_digest_engine                3129   EXIST::FUNCTION:
+ENGINE_register_ciphers                 3130   EXIST::FUNCTION:
+ENGINE_register_all_digests             3131   EXIST::FUNCTION:
+ENGINE_set_default_digests              3132   EXIST::FUNCTION:
+ENGINE_set_ciphers                      3133   EXIST::FUNCTION:
+ENGINE_get_digest                       3134   EXIST::FUNCTION:
+ENGINE_unregister_digests               3135   EXIST::FUNCTION:
+ENGINE_get_digests                      3136   EXIST::FUNCTION:
+ENGINE_register_digests                 3137   EXIST::FUNCTION:
+EVP_EncryptInit_ex                      3138   EXIST::FUNCTION:
+EVP_CipherInit_ex                       3139   EXIST::FUNCTION:
+ENGINE_set_digests                      3140   EXIST::FUNCTION:
+ENGINE_get_cipher_engine                3141   EXIST::FUNCTION:
+ENGINE_register_all_ciphers             3142   EXIST::FUNCTION:
+ENGINE_set_default_ciphers              3143   EXIST::FUNCTION:
+EVP_DecryptInit_ex                      3144   EXIST::FUNCTION:
+EVP_DigestInit_ex                       3145   EXIST::FUNCTION: