diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
| commit | ff48c0d9098080b51ea12710029135916d117806 (patch) | |
| tree | 96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/util/ssleay.num | |
| parent | bb731f5ac92655c4860a41fa818a7a63005f8369 (diff) | |
| download | vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2 vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip | |
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/util/ssleay.num')
| -rw-r--r-- | openssl/util/ssleay.num | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/openssl/util/ssleay.num b/openssl/util/ssleay.num index 2055cc159..15a58e7b1 100644 --- a/openssl/util/ssleay.num +++ b/openssl/util/ssleay.num @@ -98,9 +98,9 @@ SSLeay_add_ssl_algorithms 109 NOEXIST::FUNCTION: SSLv23_client_method 110 EXIST::FUNCTION:RSA SSLv23_method 111 EXIST::FUNCTION:RSA SSLv23_server_method 112 EXIST::FUNCTION:RSA -SSLv2_client_method 113 EXIST::FUNCTION:RSA -SSLv2_method 114 EXIST::FUNCTION:RSA -SSLv2_server_method 115 EXIST::FUNCTION:RSA +SSLv2_client_method 113 EXIST::FUNCTION:RSA,SSL2 +SSLv2_method 114 EXIST::FUNCTION:RSA,SSL2 +SSLv2_server_method 115 EXIST::FUNCTION:RSA,SSL2 SSLv3_client_method 116 EXIST::FUNCTION: SSLv3_method 117 EXIST::FUNCTION: SSLv3_server_method 118 EXIST::FUNCTION: @@ -117,8 +117,8 @@ SSL_CIPHER_get_bits 128 EXIST::FUNCTION: SSL_CIPHER_get_version 129 EXIST::FUNCTION: SSL_CIPHER_get_name 130 EXIST::FUNCTION: BIO_ssl_shutdown 131 EXIST::FUNCTION:BIO -SSL_SESSION_cmp 132 EXIST::FUNCTION: -SSL_SESSION_hash 133 EXIST::FUNCTION: +SSL_SESSION_cmp 132 NOEXIST::FUNCTION: +SSL_SESSION_hash 133 NOEXIST::FUNCTION: SSL_SESSION_get_time 134 EXIST::FUNCTION: SSL_SESSION_set_time 135 EXIST::FUNCTION: SSL_SESSION_get_timeout 136 EXIST::FUNCTION: @@ -242,3 +242,20 @@ SSL_set_SSL_CTX 290 EXIST::FUNCTION: SSL_get_servername 291 EXIST::FUNCTION:TLSEXT SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT SSL_CTX_set_client_cert_engine 293 EXIST::FUNCTION:ENGINE +SSL_CTX_use_psk_identity_hint 294 EXIST::FUNCTION:PSK +SSL_CTX_set_psk_client_callback 295 EXIST::FUNCTION:PSK +PEM_write_bio_SSL_SESSION 296 EXIST::FUNCTION: +SSL_get_psk_identity_hint 297 EXIST::FUNCTION:PSK +SSL_set_psk_server_callback 298 EXIST::FUNCTION:PSK +SSL_use_psk_identity_hint 299 EXIST::FUNCTION:PSK +SSL_set_psk_client_callback 300 EXIST::FUNCTION:PSK +PEM_read_SSL_SESSION 301 EXIST:!WIN16:FUNCTION: +PEM_read_bio_SSL_SESSION 302 EXIST::FUNCTION: +SSL_CTX_set_psk_server_callback 303 EXIST::FUNCTION:PSK +SSL_get_psk_identity 304 EXIST::FUNCTION:PSK +PEM_write_SSL_SESSION 305 EXIST:!WIN16:FUNCTION: +SSL_set_session_ticket_ext 306 EXIST::FUNCTION: +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: |