diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
tree | c800a66664ea3af61eb13928db45a26275930b0b /openssl/util/ssleay.num | |
parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/util/ssleay.num')
-rw-r--r-- | openssl/util/ssleay.num | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/openssl/util/ssleay.num b/openssl/util/ssleay.num index 15a58e7b1..37655bc40 100644 --- a/openssl/util/ssleay.num +++ b/openssl/util/ssleay.num @@ -259,3 +259,64 @@ SSL_set_session_secret_cb 307 EXIST::FUNCTION: SSL_set_session_ticket_ext_cb 308 EXIST::FUNCTION: SSL_set1_param 309 EXIST::FUNCTION: SSL_CTX_set1_param 310 EXIST::FUNCTION: +SSL_tls1_key_exporter 311 NOEXIST::FUNCTION: +SSL_renegotiate_abbreviated 312 EXIST::FUNCTION: +TLSv1_1_method 313 EXIST::FUNCTION: +TLSv1_1_client_method 314 EXIST::FUNCTION: +TLSv1_1_server_method 315 EXIST::FUNCTION: +SSL_CTX_set_srp_client_pwd_callback 316 EXIST:!VMS:FUNCTION:SRP +SSL_CTX_set_srp_client_pwd_cb 316 EXIST:VMS:FUNCTION:SRP +SSL_get_srp_g 317 EXIST::FUNCTION:SRP +SSL_CTX_set_srp_username_callback 318 EXIST:!VMS:FUNCTION:SRP +SSL_CTX_set_srp_un_cb 318 EXIST:VMS:FUNCTION:SRP +SSL_get_srp_userinfo 319 EXIST::FUNCTION:SRP +SSL_set_srp_server_param 320 EXIST::FUNCTION:SRP +SSL_set_srp_server_param_pw 321 EXIST::FUNCTION:SRP +SSL_get_srp_N 322 EXIST::FUNCTION:SRP +SSL_get_srp_username 323 EXIST::FUNCTION:SRP +SSL_CTX_set_srp_password 324 EXIST::FUNCTION:SRP +SSL_CTX_set_srp_strength 325 EXIST::FUNCTION:SRP +SSL_CTX_set_srp_verify_param_callback 326 EXIST:!VMS:FUNCTION:SRP +SSL_CTX_set_srp_vfy_param_cb 326 EXIST:VMS:FUNCTION:SRP +SSL_CTX_set_srp_miss_srp_un_cb 327 NOEXIST::FUNCTION: +SSL_CTX_set_srp_missing_srp_username_callback 327 NOEXIST::FUNCTION: +SSL_CTX_set_srp_cb_arg 328 EXIST::FUNCTION:SRP +SSL_CTX_set_srp_username 329 EXIST::FUNCTION:SRP +SSL_CTX_SRP_CTX_init 330 EXIST::FUNCTION:SRP +SSL_SRP_CTX_init 331 EXIST::FUNCTION:SRP +SRP_Calc_A_param 332 EXIST::FUNCTION:SRP +SRP_generate_server_master_secret 333 EXIST:!VMS:FUNCTION:SRP +SRP_gen_server_master_secret 333 EXIST:VMS:FUNCTION:SRP +SSL_CTX_SRP_CTX_free 334 EXIST::FUNCTION:SRP +SRP_generate_client_master_secret 335 EXIST:!VMS:FUNCTION:SRP +SRP_gen_client_master_secret 335 EXIST:VMS:FUNCTION:SRP +SSL_srp_server_param_with_username 336 EXIST:!VMS:FUNCTION:SRP +SSL_srp_server_param_with_un 336 EXIST:VMS:FUNCTION:SRP +SRP_have_to_put_srp_username 337 NOEXIST::FUNCTION: +SSL_SRP_CTX_free 338 EXIST::FUNCTION:SRP +SSL_set_debug 339 EXIST::FUNCTION: +SSL_SESSION_get0_peer 340 EXIST::FUNCTION: +TLSv1_2_client_method 341 EXIST::FUNCTION: +SSL_SESSION_set1_id_context 342 EXIST::FUNCTION: +TLSv1_2_server_method 343 EXIST::FUNCTION: +SSL_cache_hit 344 EXIST::FUNCTION: +SSL_get0_kssl_ctx 345 EXIST::FUNCTION:KRB5 +SSL_set0_kssl_ctx 346 EXIST::FUNCTION:KRB5 +SSL_SESSION_get0_id 347 NOEXIST::FUNCTION: +SSL_set_state 348 EXIST::FUNCTION: +SSL_CIPHER_get_id 349 EXIST::FUNCTION: +TLSv1_2_method 350 EXIST::FUNCTION: +SSL_SESSION_get_id_len 351 NOEXIST::FUNCTION: +kssl_ctx_get0_client_princ 352 EXIST::FUNCTION:KRB5 +SSL_export_keying_material 353 EXIST::FUNCTION:TLSEXT +SSL_set_tlsext_use_srtp 354 EXIST::FUNCTION: +SSL_CTX_set_next_protos_advertised_cb 355 EXIST:!VMS:FUNCTION:NEXTPROTONEG +SSL_CTX_set_next_protos_adv_cb 355 EXIST:VMS:FUNCTION:NEXTPROTONEG +SSL_get0_next_proto_negotiated 356 EXIST::FUNCTION:NEXTPROTONEG +SSL_get_selected_srtp_profile 357 EXIST::FUNCTION: +SSL_CTX_set_tlsext_use_srtp 358 EXIST::FUNCTION: +SSL_select_next_proto 359 EXIST::FUNCTION:NEXTPROTONEG +SSL_get_srtp_profiles 360 EXIST::FUNCTION: +SSL_CTX_set_next_proto_select_cb 361 EXIST:!VMS:FUNCTION:NEXTPROTONEG +SSL_CTX_set_next_proto_sel_cb 361 EXIST:VMS:FUNCTION:NEXTPROTONEG +SSL_SESSION_get_compress_id 362 EXIST::FUNCTION: |