Commit adccc4cc authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from OpenSSL-0_9_6-stable

parent bbc89d2e

crypto/Makefile.ssl

+3 −0
Original line number Diff line number Diff line
@@ -198,3 +198,6 @@ tmdiff.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h 
tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h

tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h

uid.o: ../include/openssl/crypto.h ../include/openssl/opensslv.h

uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h

uid.o: ../include/openssl/symhacks.h

util/libeay.num

+61 −58
Original line number Diff line number Diff line
@@ -1870,61 +1870,64 @@ X509_keyid_set1 2460 EXIST::FUNCTION: 
BIO_next                                2461	EXIST::FUNCTION:

DSO_METHOD_vms                          2462	EXIST::FUNCTION:

BIO_f_linebuffer                        2463	EXIST:VMS:FUNCTION:

ERR_load_ENGINE_strings                 2464	EXIST::FUNCTION:

ENGINE_set_DSA                          2465	EXIST::FUNCTION:

ENGINE_get_finish_function              2466	EXIST::FUNCTION:

ENGINE_get_default_RSA                  2467	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp                   2468	EXIST::FUNCTION:

DSA_get_default_openssl_method          2469	EXIST::FUNCTION:DSA

ENGINE_set_DH                           2470	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp_crt       2471	EXIST:!VMS:FUNCTION:

ENGINE_set_def_BN_mod_exp_crt           2471	EXIST:VMS:FUNCTION:

ENGINE_init                             2472	EXIST::FUNCTION:

DH_get_default_openssl_method           2473	EXIST::FUNCTION:DH

RSA_set_default_openssl_method          2474	EXIST::FUNCTION:RSA

ENGINE_finish                           2475	EXIST::FUNCTION:

ENGINE_load_public_key                  2476	EXIST::FUNCTION:

ENGINE_get_DH                           2477	EXIST::FUNCTION:

ENGINE_ctrl                             2478	EXIST::FUNCTION:

ENGINE_get_init_function                2479	EXIST::FUNCTION:

ENGINE_set_init_function                2480	EXIST::FUNCTION:

ENGINE_set_default_DSA                  2481	EXIST::FUNCTION:

ENGINE_get_name                         2482	EXIST::FUNCTION:

ENGINE_get_last                         2483	EXIST::FUNCTION:

ENGINE_get_prev                         2484	EXIST::FUNCTION:

ENGINE_get_default_DH                   2485	EXIST::FUNCTION:

ENGINE_get_RSA                          2486	EXIST::FUNCTION:

ENGINE_set_default                      2487	EXIST::FUNCTION:

ENGINE_get_RAND                         2488	EXIST::FUNCTION:

ENGINE_get_first                        2489	EXIST::FUNCTION:

ENGINE_by_id                            2490	EXIST::FUNCTION:

ENGINE_set_finish_function              2491	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp_crt       2492	EXIST:!VMS:FUNCTION:

ENGINE_get_def_BN_mod_exp_crt           2492	EXIST:VMS:FUNCTION:

RSA_get_default_openssl_method          2493	EXIST::FUNCTION:RSA

ENGINE_set_RSA                          2494	EXIST::FUNCTION:

ENGINE_load_private_key                 2495	EXIST::FUNCTION:

ENGINE_set_default_RAND                 2496	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp                   2497	EXIST::FUNCTION:

ENGINE_remove                           2498	EXIST::FUNCTION:

ENGINE_free                             2499	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp_crt               2500	EXIST::FUNCTION:

ENGINE_get_next                         2501	EXIST::FUNCTION:

ENGINE_set_name                         2502	EXIST::FUNCTION:

ENGINE_get_default_DSA                  2503	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp           2504	EXIST::FUNCTION:

ENGINE_set_default_RSA                  2505	EXIST::FUNCTION:

ENGINE_get_default_RAND                 2506	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp           2507	EXIST::FUNCTION:

ENGINE_set_RAND                         2508	EXIST::FUNCTION:

ENGINE_set_id                           2509	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp_crt               2510	EXIST::FUNCTION:

ENGINE_set_default_DH                   2511	EXIST::FUNCTION:

ENGINE_new                              2512	EXIST::FUNCTION:

ENGINE_get_id                           2513	EXIST::FUNCTION:

DSA_set_default_openssl_method          2514	EXIST::FUNCTION:DSA

ENGINE_add                              2515	EXIST::FUNCTION:

DH_set_default_openssl_method           2516	EXIST::FUNCTION:DH

ENGINE_get_DSA                          2517	EXIST::FUNCTION:

ENGINE_get_ctrl_function                2518	EXIST::FUNCTION:

ENGINE_set_ctrl_function                2519	EXIST::FUNCTION:
 
BN_bntest_rand                          2464	EXIST::FUNCTION:

OPENSSL_issetugid                       2465	EXIST::FUNCTION:

BN_rand_range                           2466	EXIST::FUNCTION:

ERR_load_ENGINE_strings                 2467	EXIST::FUNCTION:

ENGINE_set_DSA                          2468	EXIST::FUNCTION:

ENGINE_get_finish_function              2469	EXIST::FUNCTION:

ENGINE_get_default_RSA                  2470	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp                   2471	EXIST::FUNCTION:

DSA_get_default_openssl_method          2472	EXIST::FUNCTION:DSA

ENGINE_set_DH                           2473	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp_crt       2474	EXIST:!VMS:FUNCTION:

ENGINE_set_def_BN_mod_exp_crt           2474	EXIST:VMS:FUNCTION:

ENGINE_init                             2475	EXIST::FUNCTION:

DH_get_default_openssl_method           2476	EXIST::FUNCTION:DH

RSA_set_default_openssl_method          2477	EXIST::FUNCTION:RSA

ENGINE_finish                           2478	EXIST::FUNCTION:

ENGINE_load_public_key                  2479	EXIST::FUNCTION:

ENGINE_get_DH                           2480	EXIST::FUNCTION:

ENGINE_ctrl                             2481	EXIST::FUNCTION:

ENGINE_get_init_function                2482	EXIST::FUNCTION:

ENGINE_set_init_function                2483	EXIST::FUNCTION:

ENGINE_set_default_DSA                  2484	EXIST::FUNCTION:

ENGINE_get_name                         2485	EXIST::FUNCTION:

ENGINE_get_last                         2486	EXIST::FUNCTION:

ENGINE_get_prev                         2487	EXIST::FUNCTION:

ENGINE_get_default_DH                   2488	EXIST::FUNCTION:

ENGINE_get_RSA                          2489	EXIST::FUNCTION:

ENGINE_set_default                      2490	EXIST::FUNCTION:

ENGINE_get_RAND                         2491	EXIST::FUNCTION:

ENGINE_get_first                        2492	EXIST::FUNCTION:

ENGINE_by_id                            2493	EXIST::FUNCTION:

ENGINE_set_finish_function              2494	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp_crt       2495	EXIST:!VMS:FUNCTION:

ENGINE_get_def_BN_mod_exp_crt           2495	EXIST:VMS:FUNCTION:

RSA_get_default_openssl_method          2496	EXIST::FUNCTION:RSA

ENGINE_set_RSA                          2497	EXIST::FUNCTION:

ENGINE_load_private_key                 2498	EXIST::FUNCTION:

ENGINE_set_default_RAND                 2499	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp                   2500	EXIST::FUNCTION:

ENGINE_remove                           2501	EXIST::FUNCTION:

ENGINE_free                             2502	EXIST::FUNCTION:

ENGINE_get_BN_mod_exp_crt               2503	EXIST::FUNCTION:

ENGINE_get_next                         2504	EXIST::FUNCTION:

ENGINE_set_name                         2505	EXIST::FUNCTION:

ENGINE_get_default_DSA                  2506	EXIST::FUNCTION:

ENGINE_set_default_BN_mod_exp           2507	EXIST::FUNCTION:

ENGINE_set_default_RSA                  2508	EXIST::FUNCTION:

ENGINE_get_default_RAND                 2509	EXIST::FUNCTION:

ENGINE_get_default_BN_mod_exp           2510	EXIST::FUNCTION:

ENGINE_set_RAND                         2511	EXIST::FUNCTION:

ENGINE_set_id                           2512	EXIST::FUNCTION:

ENGINE_set_BN_mod_exp_crt               2513	EXIST::FUNCTION:

ENGINE_set_default_DH                   2514	EXIST::FUNCTION:

ENGINE_new                              2515	EXIST::FUNCTION:

ENGINE_get_id                           2516	EXIST::FUNCTION:

DSA_set_default_openssl_method          2517	EXIST::FUNCTION:DSA

ENGINE_add                              2518	EXIST::FUNCTION:

DH_set_default_openssl_method           2519	EXIST::FUNCTION:DH

ENGINE_get_DSA                          2520	EXIST::FUNCTION:

ENGINE_get_ctrl_function                2521	EXIST::FUNCTION:

ENGINE_set_ctrl_function                2522	EXIST::FUNCTION: