Commit 25814b96 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge of main trunk, no conflicts this time. 

make update
parent 0fc7c501

apps/Makefile.ssl

+176 −161

File changed.

Preview size limit exceeded, changes collapsed.

crypto/rand/rand_win.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ int RAND_poll(void) 
		if (cursor)

			{

			/* cursor position */

			cursor(buf);

			cursor((PCURSORINFO)buf);

			RAND_add(buf, sizeof(buf), 0);

			}

util/libeay.num

+70 −62
Original line number Diff line number Diff line
@@ -1812,15 +1812,21 @@ d2i_RSA_NET 2408 EXIST::FUNCTION:RSA 
DSO_bind_func                           2409	EXIST::FUNCTION:

CRYPTO_get_new_dynlockid                2410	EXIST::FUNCTION:

sk_new_null                             2411	EXIST::FUNCTION:

CRYPTO_set_dynlock_destroy_callback     2412	EXIST::FUNCTION:

CRYPTO_set_dynlock_destroy_callback     2412	EXIST:!VMS:FUNCTION:

CRYPTO_set_dynlock_destroy_cb           2412	EXIST:VMS:FUNCTION:

CRYPTO_destroy_dynlockid                2413	EXIST::FUNCTION:

CRYPTO_set_dynlock_size                 2414	NOEXIST::FUNCTION:

CRYPTO_set_dynlock_create_callback      2415	EXIST::FUNCTION:

CRYPTO_set_dynlock_lock_callback        2416	EXIST::FUNCTION:

CRYPTO_get_dynlock_lock_callback        2417	EXIST::FUNCTION:

CRYPTO_get_dynlock_destroy_callback     2418	EXIST::FUNCTION:

CRYPTO_set_dynlock_create_callback      2415	EXIST:!VMS:FUNCTION:

CRYPTO_set_dynlock_create_cb            2415	EXIST:VMS:FUNCTION:

CRYPTO_set_dynlock_lock_callback        2416	EXIST:!VMS:FUNCTION:

CRYPTO_set_dynlock_lock_cb              2416	EXIST:VMS:FUNCTION:

CRYPTO_get_dynlock_lock_callback        2417	EXIST:!VMS:FUNCTION:

CRYPTO_get_dynlock_lock_cb              2417	EXIST:VMS:FUNCTION:

CRYPTO_get_dynlock_destroy_callback     2418	EXIST:!VMS:FUNCTION:

CRYPTO_get_dynlock_destroy_cb           2418	EXIST:VMS:FUNCTION:

CRYPTO_get_dynlock_value                2419	EXIST::FUNCTION:

CRYPTO_get_dynlock_create_callback      2420	EXIST::FUNCTION:

CRYPTO_get_dynlock_create_callback      2420	EXIST:!VMS:FUNCTION:

CRYPTO_get_dynlock_create_cb            2420	EXIST:VMS:FUNCTION:

c2i_ASN1_BIT_STRING                     2421	EXIST::FUNCTION:

i2c_ASN1_BIT_STRING                     2422	EXIST::FUNCTION:

RAND_poll                               2423	EXIST::FUNCTION:
@@ -1860,59 +1866,61 @@ des_set_weak_key_flag 2456 EXIST::VARIABLE:DES 
des_check_key                           2457	EXIST::VARIABLE:DES

des_rw_mode                             2458	EXIST::VARIABLE:DES

RSA_PKCS1_RSAref                        2459	EXIST:RSAREF:FUNCTION:RSA

ERR_load_ENGINE_strings                 2460	EXIST::FUNCTION:

ENGINE_set_DSA                          2461	EXIST::FUNCTION:

ENGINE_get_finish_function              2462	EXIST::FUNCTION:

ENGINE_get_default_RSA                  2463	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp                   2464	EXIST::FUNCTION:

DSA_get_default_openssl_method          2465	EXIST::FUNCTION:DSA

ENGINE_set_DH                           2466	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp_crt       2467	EXIST::FUNCTION:

ENGINE_init                             2468	EXIST::FUNCTION:

DH_get_default_openssl_method           2469	EXIST::FUNCTION:DH

RSA_set_default_openssl_method          2470	EXIST::FUNCTION:RSA

ENGINE_finish                           2471	EXIST::FUNCTION:

ENGINE_load_public_key                  2472	EXIST::FUNCTION:

ENGINE_get_DH                           2473	EXIST::FUNCTION:

ENGINE_ctrl                             2474	EXIST::FUNCTION:

ENGINE_get_init_function                2475	EXIST::FUNCTION:

ENGINE_set_init_function                2476	EXIST::FUNCTION:

ENGINE_set_default_DSA                  2477	EXIST::FUNCTION:

ENGINE_get_name                         2478	EXIST::FUNCTION:

ENGINE_get_last                         2479	EXIST::FUNCTION:

ENGINE_get_prev                         2480	EXIST::FUNCTION:

ENGINE_get_default_DH                   2481	EXIST::FUNCTION:

ENGINE_get_RSA                          2482	EXIST::FUNCTION:

ENGINE_set_default                      2483	EXIST::FUNCTION:

ENGINE_get_RAND                         2484	EXIST::FUNCTION:

ENGINE_get_first                        2485	EXIST::FUNCTION:

ENGINE_by_id                            2486	EXIST::FUNCTION:

ENGINE_set_finish_function              2487	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp_crt       2488	EXIST::FUNCTION:

RSA_get_default_openssl_method          2489	EXIST::FUNCTION:RSA

ENGINE_set_RSA                          2490	EXIST::FUNCTION:

ENGINE_load_private_key                 2491	EXIST::FUNCTION:

ENGINE_set_default_RAND                 2492	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp                   2493	EXIST::FUNCTION:

ENGINE_remove                           2494	EXIST::FUNCTION:

ENGINE_free                             2495	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp_crt               2496	EXIST::FUNCTION:

ENGINE_get_next                         2497	EXIST::FUNCTION:

ENGINE_set_name                         2498	EXIST::FUNCTION:

ENGINE_get_default_DSA                  2499	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp           2500	EXIST::FUNCTION:

ENGINE_set_default_RSA                  2501	EXIST::FUNCTION:

ENGINE_get_default_RAND                 2502	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp           2503	EXIST::FUNCTION:

ENGINE_set_RAND                         2504	EXIST::FUNCTION:

ENGINE_set_id                           2505	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp_crt               2506	EXIST::FUNCTION:

ENGINE_set_default_DH                   2507	EXIST::FUNCTION:

ENGINE_new                              2508	EXIST::FUNCTION:

ENGINE_get_id                           2509	EXIST::FUNCTION:

DSA_set_default_openssl_method          2510	EXIST::FUNCTION:DSA

ENGINE_add                              2511	EXIST::FUNCTION:

DH_set_default_openssl_method           2512	EXIST::FUNCTION:DH

ENGINE_get_DSA                          2513	EXIST::FUNCTION:

ENGINE_get_ctrl_function                2514	EXIST::FUNCTION:

ENGINE_set_ctrl_function                2515	EXIST::FUNCTION:
 
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:

util/ssleay.num

+13 −7
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ SSL_CTX_get_verify_callback 10 EXIST::FUNCTION: 
SSL_CTX_get_verify_mode                 11	EXIST::FUNCTION:

SSL_CTX_new                             12	EXIST::FUNCTION:

SSL_CTX_remove_session                  13	EXIST::FUNCTION:

SSL_CTX_set_cert_verify_cb              14	NOEXIST::FUNCTION:

SSL_CTX_set_cipher_list                 15	EXIST::FUNCTION:

SSL_CTX_set_client_CA_list              16	EXIST::FUNCTION:

SSL_CTX_set_default_passwd_cb           17	EXIST::FUNCTION:
@@ -127,7 +126,8 @@ SSL_SESSION_set_timeout 137 EXIST::FUNCTION: 
SSL_CTX_get_ex_data                     138	EXIST::FUNCTION:

SSL_CTX_get_quiet_shutdown              140	EXIST::FUNCTION:

SSL_CTX_load_verify_locations           141	EXIST::FUNCTION:

SSL_CTX_set_default_verify_paths        142	EXIST::FUNCTION:

SSL_CTX_set_default_verify_paths        142	EXIST:!VMS:FUNCTION:

SSL_CTX_set_def_verify_paths            142	EXIST:VMS:FUNCTION:

SSL_CTX_set_ex_data                     143	EXIST::FUNCTION:

SSL_CTX_set_quiet_shutdown              145	EXIST::FUNCTION:

SSL_SESSION_get_ex_data                 146	EXIST::FUNCTION:
@@ -154,7 +154,8 @@ TLSv1_server_method 171 EXIST::FUNCTION: 
TLSv1_client_method                     172	EXIST::FUNCTION:

BIO_new_buffer_ssl_connect              173	EXIST::FUNCTION:

BIO_new_ssl_connect                     174	EXIST::FUNCTION:

SSL_get_ex_data_X509_STORE_CTX_idx      175	EXIST::FUNCTION:

SSL_get_ex_data_X509_STORE_CTX_idx      175	EXIST:!VMS:FUNCTION:

SSL_get_ex_d_X509_STORE_CTX_idx         175	EXIST:VMS:FUNCTION:

SSL_CTX_set_tmp_dh_callback             176	EXIST::FUNCTION:DH

SSL_CTX_set_tmp_rsa_callback            177	EXIST::FUNCTION:RSA

SSL_CTX_set_timeout                     178	EXIST::FUNCTION:
@@ -164,19 +165,24 @@ SSL_CTX_set_cert_store 181 EXIST::FUNCTION: 
SSL_want                                182	EXIST::FUNCTION:

SSL_library_init                        183	EXIST::FUNCTION:

SSL_COMP_add_compression_method         184	EXIST::FUNCTION:

SSL_add_file_cert_subjects_to_stack     185	EXIST::FUNCTION:

SSL_add_file_cert_subjects_to_stack     185	EXIST:!VMS:FUNCTION:

SSL_add_file_cert_subjs_to_stk          185	EXIST:VMS:FUNCTION:

SSL_set_tmp_rsa_callback                186	EXIST::FUNCTION:RSA

SSL_set_tmp_dh_callback                 187	EXIST::FUNCTION:DH

SSL_add_dir_cert_subjects_to_stack      188	NOEXIST::FUNCTION:

SSL_add_dir_cert_subjs_to_stk           188	EXIST:VMS:FUNCTION:

SSL_set_session_id_context              189	EXIST::FUNCTION:

SSL_CTX_use_certificate_chain_file      222	EXIST::FUNCTION:

SSL_CTX_use_certificate_chain_file      222	EXIST:!VMS:FUNCTION:

SSL_CTX_use_cert_chain_file             222	EXIST:VMS:FUNCTION:

SSL_CTX_set_verify_depth                225	EXIST::FUNCTION:

SSL_set_verify_depth                    226	EXIST::FUNCTION:

SSL_CTX_get_verify_depth                228	EXIST::FUNCTION:

SSL_get_verify_depth                    229	EXIST::FUNCTION:

SSL_CTX_set_session_id_context          231	EXIST::FUNCTION:

SSL_CTX_set_cert_verify_callback        232	EXIST::FUNCTION:

SSL_CTX_set_default_passwd_cb_userdata  235	EXIST::FUNCTION:

SSL_CTX_set_cert_verify_callback        232	EXIST:!VMS:FUNCTION:

SSL_CTX_set_cert_verify_cb              232	EXIST:VMS:FUNCTION:

SSL_CTX_set_default_passwd_cb_userdata  235	EXIST:!VMS:FUNCTION:

SSL_CTX_set_def_passwd_cb_ud            235	EXIST:VMS:FUNCTION:

SSL_set_purpose                         236	EXIST::FUNCTION:

SSL_CTX_set_trust                       237	EXIST::FUNCTION:

SSL_CTX_set_purpose                     238	EXIST::FUNCTION: