diff options
| author | Matt Caswell <matt@openssl.org> | 2016-01-25 15:28:57 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-29 12:58:44 +0000 |
| commit | ff75a25749c7fceaff7503af6f09d4299a052996 (patch) | |
| tree | 4f7d8161e709ea1b82e9ceef0d27f78393b18127 /util | |
| parent | b32166b4fabd2a3aeec382521b0173b24a5d7c02 (diff) | |
Refactor the async wait fd logic
Implementation experience has shown that the original plan for async wait
fds was too simplistic. Originally the async logic created a pipe internally
and user/engine code could then get access to it via API calls. It is more
flexible if the engine is able to create its own fd and provide it to the
async code.
Another issue is that there can be a lot of churn in the fd value within
the context of (say) a single SSL connection leading to continually adding
and removing fds from (say) epoll. It is better if we can provide some
stability of the fd value across a whole SSL connection. This is
problematic because an engine has no concept of an SSL connection.
This commit refactors things to introduce an ASYNC_WAIT_CTX which acts as a
proxy for an SSL connection down at the engine layer.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/libeay.num | 14 | ||||
| -rwxr-xr-x | util/ssleay.num | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/util/libeay.num b/util/libeay.num index 06a50213f4..ea14ebdc63 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4515,10 +4515,10 @@ ASYNC_pause_job 5013 1_1_0 EXIST::FUNCTION: ASYNC_start_job 5014 1_1_0 EXIST::FUNCTION: ASYNC_init_thread 5015 1_1_0 EXIST::FUNCTION: ASYNC_cleanup_thread 5016 1_1_0 EXIST::FUNCTION: -ASYNC_wake 5017 1_1_0 EXIST::FUNCTION: -ASYNC_clear_wake 5018 1_1_0 EXIST::FUNCTION: +ASYNC_wake 5017 1_1_0 NOEXIST::FUNCTION: +ASYNC_clear_wake 5018 1_1_0 NOEXIST::FUNCTION: ASYNC_get_current_job 5019 1_1_0 EXIST::FUNCTION: -ASYNC_get_wait_fd 5020 1_1_0 EXIST::FUNCTION: +ASYNC_get_wait_fd 5020 1_1_0 NOEXIST::FUNCTION: ERR_load_ASYNC_strings 5021 1_1_0 EXIST::FUNCTION: ASYNC_unblock_pause 5022 1_1_0 EXIST::FUNCTION: ASYNC_block_pause 5023 1_1_0 EXIST::FUNCTION: @@ -4758,3 +4758,11 @@ SCT_set_version 5261 1_1_0 EXIST::FUNCTION: SCT_LIST_free 5262 1_1_0 EXIST::FUNCTION: SCT_get_log_entry_type 5263 1_1_0 EXIST::FUNCTION: EC_KEY_can_sign 5264 1_1_0 EXIST::FUNCTION:EC +ASYNC_WAIT_CTX_free 5265 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_get_all_fds 5266 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_get_fd 5267 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_clear_fd 5268 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_get_changed_fds 5269 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_set_wait_fd 5270 1_1_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_new 5271 1_1_0 EXIST::FUNCTION: +ASYNC_get_wait_ctx 5272 1_1_0 EXIST::FUNCTION: diff --git a/util/ssleay.num b/util/ssleay.num index 45583f7834..ed7606a510 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -391,7 +391,7 @@ SSL_get_state 446 1_1_0 EXIST::FUNCTION: SSL_set_default_passwd_cb 447 1_1_0 EXIST::FUNCTION: SSL_set_default_passwd_cb_userdata 448 1_1_0 EXIST::FUNCTION: SSL_waiting_for_async 449 1_1_0 EXIST::FUNCTION: -SSL_get_async_wait_fd 450 1_1_0 EXIST::FUNCTION: +SSL_get_all_async_fds 450 1_1_0 EXIST::FUNCTION: SSL_add_ssl_module 451 1_1_0 EXIST::FUNCTION: SSL_CTX_config 452 1_1_0 EXIST::FUNCTION: SSL_config 453 1_1_0 EXIST::FUNCTION: @@ -417,3 +417,4 @@ SSL_CTX_up_ref 472 1_1_0 EXIST::FUNCTION: DTLSv1_listen 473 1_1_0 EXIST::FUNCTION: SSL_get0_verified_chain 474 1_1_0 EXIST::FUNCTION: OPENSSL_init_ssl 475 1_1_0 EXIST::FUNCTION: +SSL_get_changed_async_fds 476 1_1_0 EXIST::FUNCTION: |