Merged in the main trunk, did a 'make update', added a couple of

warnings in appropriate places about building a shared library from
the ENGINE source.

1 files changed, 57 insertions, 56 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 0465be4cff..8186525c47 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1868,59 +1868,60 @@ des_rw_mode                             2458	EXIST::VARIABLE:DES
 RSA_PKCS1_RSAref                        2459	EXIST:RSAREF:FUNCTION:RSA
 X509_keyid_set1                         2460	EXIST::FUNCTION:
 BIO_next                                2461	EXIST::FUNCTION:
-ERR_load_ENGINE_strings                 2462	EXIST::FUNCTION:
-ENGINE_set_DSA                          2463	EXIST::FUNCTION:
-ENGINE_get_finish_function              2464	EXIST::FUNCTION:
-ENGINE_get_default_RSA                  2465	EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp                   2466	EXIST::FUNCTION:
-DSA_get_default_openssl_method          2467	EXIST::FUNCTION:DSA
-ENGINE_set_DH                           2468	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp_crt       2469	EXIST::FUNCTION:
-ENGINE_init                             2470	EXIST::FUNCTION:
-DH_get_default_openssl_method           2471	EXIST::FUNCTION:DH
-RSA_set_default_openssl_method          2472	EXIST::FUNCTION:RSA
-ENGINE_finish                           2473	EXIST::FUNCTION:
-ENGINE_load_public_key                  2474	EXIST::FUNCTION:
-ENGINE_get_DH                           2475	EXIST::FUNCTION:
-ENGINE_ctrl                             2476	EXIST::FUNCTION:
-ENGINE_get_init_function                2477	EXIST::FUNCTION:
-ENGINE_set_init_function                2478	EXIST::FUNCTION:
-ENGINE_set_default_DSA                  2479	EXIST::FUNCTION:
-ENGINE_get_name                         2480	EXIST::FUNCTION:
-ENGINE_get_last                         2481	EXIST::FUNCTION:
-ENGINE_get_prev                         2482	EXIST::FUNCTION:
-ENGINE_get_default_DH                   2483	EXIST::FUNCTION:
-ENGINE_get_RSA                          2484	EXIST::FUNCTION:
-ENGINE_set_default                      2485	EXIST::FUNCTION:
-ENGINE_get_RAND                         2486	EXIST::FUNCTION:
-ENGINE_get_first                        2487	EXIST::FUNCTION:
-ENGINE_by_id                            2488	EXIST::FUNCTION:
-ENGINE_set_finish_function              2489	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp_crt       2490	EXIST::FUNCTION:
-RSA_get_default_openssl_method          2491	EXIST::FUNCTION:RSA
-ENGINE_set_RSA                          2492	EXIST::FUNCTION:
-ENGINE_load_private_key                 2493	EXIST::FUNCTION:
-ENGINE_set_default_RAND                 2494	EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp                   2495	EXIST::FUNCTION:
-ENGINE_remove                           2496	EXIST::FUNCTION:
-ENGINE_free                             2497	EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp_crt               2498	EXIST::FUNCTION:
-ENGINE_get_next                         2499	EXIST::FUNCTION:
-ENGINE_set_name                         2500	EXIST::FUNCTION:
-ENGINE_get_default_DSA                  2501	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp           2502	EXIST::FUNCTION:
-ENGINE_set_default_RSA                  2503	EXIST::FUNCTION:
-ENGINE_get_default_RAND                 2504	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp           2505	EXIST::FUNCTION:
-ENGINE_set_RAND                         2506	EXIST::FUNCTION:
-ENGINE_set_id                           2507	EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp_crt               2508	EXIST::FUNCTION:
-ENGINE_set_default_DH                   2509	EXIST::FUNCTION:
-ENGINE_new                              2510	EXIST::FUNCTION:
-ENGINE_get_id                           2511	EXIST::FUNCTION:
-DSA_set_default_openssl_method          2512	EXIST::FUNCTION:DSA
-ENGINE_add                              2513	EXIST::FUNCTION:
-DH_set_default_openssl_method           2514	EXIST::FUNCTION:DH
-ENGINE_get_DSA                          2515	EXIST::FUNCTION:
-ENGINE_get_ctrl_function                2516	EXIST::FUNCTION:
-ENGINE_set_ctrl_function                2517	EXIST::FUNCTION:
+DSO_METHOD_vms                          2462	EXIST::FUNCTION:
+ERR_load_ENGINE_strings                 2463	EXIST::FUNCTION:
+ENGINE_set_DSA                          2464	EXIST::FUNCTION:
+ENGINE_get_finish_function              2465	EXIST::FUNCTION:
+ENGINE_get_default_RSA                  2466	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp                   2467	EXIST::FUNCTION:
+DSA_get_default_openssl_method          2468	EXIST::FUNCTION:DSA
+ENGINE_set_DH                           2469	EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2470	EXIST::FUNCTION:
+ENGINE_init                             2471	EXIST::FUNCTION:
+DH_get_default_openssl_method           2472	EXIST::FUNCTION:DH
+RSA_set_default_openssl_method          2473	EXIST::FUNCTION:RSA
+ENGINE_finish                           2474	EXIST::FUNCTION:
+ENGINE_load_public_key                  2475	EXIST::FUNCTION:
+ENGINE_get_DH                           2476	EXIST::FUNCTION:
+ENGINE_ctrl                             2477	EXIST::FUNCTION:
+ENGINE_get_init_function                2478	EXIST::FUNCTION:
+ENGINE_set_init_function                2479	EXIST::FUNCTION:
+ENGINE_set_default_DSA                  2480	EXIST::FUNCTION:
+ENGINE_get_name                         2481	EXIST::FUNCTION:
+ENGINE_get_last                         2482	EXIST::FUNCTION:
+ENGINE_get_prev                         2483	EXIST::FUNCTION:
+ENGINE_get_default_DH                   2484	EXIST::FUNCTION:
+ENGINE_get_RSA                          2485	EXIST::FUNCTION:
+ENGINE_set_default                      2486	EXIST::FUNCTION:
+ENGINE_get_RAND                         2487	EXIST::FUNCTION:
+ENGINE_get_first                        2488	EXIST::FUNCTION:
+ENGINE_by_id                            2489	EXIST::FUNCTION:
+ENGINE_set_finish_function              2490	EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2491	EXIST::FUNCTION:
+RSA_get_default_openssl_method          2492	EXIST::FUNCTION:RSA
+ENGINE_set_RSA                          2493	EXIST::FUNCTION:
+ENGINE_load_private_key                 2494	EXIST::FUNCTION:
+ENGINE_set_default_RAND                 2495	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp                   2496	EXIST::FUNCTION:
+ENGINE_remove                           2497	EXIST::FUNCTION:
+ENGINE_free                             2498	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp_crt               2499	EXIST::FUNCTION:
+ENGINE_get_next                         2500	EXIST::FUNCTION:
+ENGINE_set_name                         2501	EXIST::FUNCTION:
+ENGINE_get_default_DSA                  2502	EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp           2503	EXIST::FUNCTION:
+ENGINE_set_default_RSA                  2504	EXIST::FUNCTION:
+ENGINE_get_default_RAND                 2505	EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp           2506	EXIST::FUNCTION:
+ENGINE_set_RAND                         2507	EXIST::FUNCTION:
+ENGINE_set_id                           2508	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp_crt               2509	EXIST::FUNCTION:
+ENGINE_set_default_DH                   2510	EXIST::FUNCTION:
+ENGINE_new                              2511	EXIST::FUNCTION:
+ENGINE_get_id                           2512	EXIST::FUNCTION:
+DSA_set_default_openssl_method          2513	EXIST::FUNCTION:DSA
+ENGINE_add                              2514	EXIST::FUNCTION:
+DH_set_default_openssl_method           2515	EXIST::FUNCTION:DH
+ENGINE_get_DSA                          2516	EXIST::FUNCTION:
+ENGINE_get_ctrl_function                2517	EXIST::FUNCTION:
+ENGINE_set_ctrl_function                2518	EXIST::FUNCTION: