Merge the engine branch into the main trunk. All conflicts resolved.

[openssl.git] / util / libeay.num

diff --git a/util/libeay.num b/util/libeay.num
index 05e35d16a9d9ac835b12e8e372c7961da199706a..a3b15bbeb8e2ac072cdeb498768952635580c547 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1874,3 +1874,66 @@ X509_print_ex                           2464     EXIST::FUNCTION:
 X509_print_ex_fp                        2465   EXIST::FUNCTION:FP_API
 EVP_rijndael_ecb                        2466   EXIST::FUNCTION:
 NCONF_get_number_e                      2467   EXIST::FUNCTION:
+ERR_load_ENGINE_strings                 2468   EXIST::FUNCTION:
+ENGINE_set_DSA                          2469   EXIST::FUNCTION:
+ENGINE_get_finish_function              2470   EXIST::FUNCTION:
+ENGINE_get_default_RSA                  2471   EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp                   2472   EXIST::FUNCTION:
+DSA_get_default_openssl_method          2473   EXIST::FUNCTION:DSA
+DSO_convert_filename                    2474   EXIST::FUNCTION:
+ENGINE_set_DH                           2475   EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2476   EXIST:!VMS:FUNCTION:
+ENGINE_set_def_BN_mod_exp_crt           2476   EXIST:VMS:FUNCTION:
+ENGINE_init                             2477   EXIST::FUNCTION:
+DH_get_default_openssl_method           2478   EXIST::FUNCTION:DH
+RSA_set_default_openssl_method          2479   EXIST::FUNCTION:RSA
+ENGINE_finish                           2480   EXIST::FUNCTION:
+ENGINE_load_public_key                  2481   EXIST::FUNCTION:
+ENGINE_get_DH                           2482   EXIST::FUNCTION:
+ENGINE_ctrl                             2483   EXIST::FUNCTION:
+ENGINE_get_init_function                2484   EXIST::FUNCTION:
+ENGINE_set_init_function                2485   EXIST::FUNCTION:
+ENGINE_set_default_DSA                  2486   EXIST::FUNCTION:
+ENGINE_get_name                         2487   EXIST::FUNCTION:
+ENGINE_get_last                         2488   EXIST::FUNCTION:
+ENGINE_get_prev                         2489   EXIST::FUNCTION:
+ENGINE_get_default_DH                   2490   EXIST::FUNCTION:
+ENGINE_get_RSA                          2491   EXIST::FUNCTION:
+ENGINE_set_default                      2492   EXIST::FUNCTION:
+ENGINE_get_RAND                         2493   EXIST::FUNCTION:
+ENGINE_get_first                        2494   EXIST::FUNCTION:
+ENGINE_by_id                            2495   EXIST::FUNCTION:
+ENGINE_set_finish_function              2496   EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2497   EXIST:!VMS:FUNCTION:
+ENGINE_get_def_BN_mod_exp_crt           2497   EXIST:VMS:FUNCTION:
+DSO_get_filename                        2498   EXIST::FUNCTION:
+RSA_get_default_openssl_method          2499   EXIST::FUNCTION:RSA
+ENGINE_set_RSA                          2500   EXIST::FUNCTION:
+ENGINE_load_private_key                 2501   EXIST::FUNCTION:
+ENGINE_set_default_RAND                 2502   EXIST::FUNCTION:
+DSO_get_loaded_filename                 2503   EXIST::FUNCTION:
+DSO_set_name_converter                  2504   EXIST::FUNCTION:
+DSO_set_filename                        2505   EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp                   2506   EXIST::FUNCTION:
+ENGINE_remove                           2507   EXIST::FUNCTION:
+ENGINE_free                             2508   EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp_crt               2509   EXIST::FUNCTION:
+ENGINE_get_next                         2510   EXIST::FUNCTION:
+ENGINE_set_name                         2511   EXIST::FUNCTION:
+ENGINE_get_default_DSA                  2512   EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp           2513   EXIST::FUNCTION:
+ENGINE_set_default_RSA                  2514   EXIST::FUNCTION:
+ENGINE_get_default_RAND                 2515   EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp           2516   EXIST::FUNCTION:
+ENGINE_set_RAND                         2517   EXIST::FUNCTION:
+ENGINE_set_id                           2518   EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp_crt               2519   EXIST::FUNCTION:
+ENGINE_set_default_DH                   2520   EXIST::FUNCTION:
+ENGINE_new                              2521   EXIST::FUNCTION:
+ENGINE_get_id                           2522   EXIST::FUNCTION:
+DSA_set_default_openssl_method          2523   EXIST::FUNCTION:DSA
+ENGINE_add                              2524   EXIST::FUNCTION:
+DH_set_default_openssl_method           2525   EXIST::FUNCTION:DH
+ENGINE_get_DSA                          2526   EXIST::FUNCTION:
+ENGINE_get_ctrl_function                2527   EXIST::FUNCTION:
+ENGINE_set_ctrl_function                2528   EXIST::FUNCTION: