diff options
| author | Ping Yu <ping.yu@intel.com> | 2018-11-05 21:41:01 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-27 13:27:17 +0100 |
| commit | 9f5a87fd665cb597fa1c1f4eef882d2d2f833e61 (patch) | |
| tree | 3bad8287fe464c81267aa7cf43a41344fd6db414 /util | |
| parent | clarify which functions are the CMS functions which must have CMS_PARTIAL set (diff) | |
| download | openssl-9f5a87fd665cb597fa1c1f4eef882d2d2f833e61.tar.xz openssl-9f5a87fd665cb597fa1c1f4eef882d2d2f833e61.zip | |
add an additional async notification communication method based on callback
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
Signed-off-by: Ping Yu <ping.yu@intel.com>
Signed-off-by: Steven Linsell <stevenx.linsell@intel.com>
(Merged from https://github.com/openssl/openssl/pull/7573)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 4 | ||||
| -rw-r--r-- | util/libssl.num | 5 | ||||
| -rw-r--r-- | util/private.num | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index b8b19801b2..e7d2ed7625 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4622,3 +4622,7 @@ CRYPTO_siv128_cleanup 4577 3_0_0 EXIST::FUNCTION:SIV CRYPTO_siv128_speed 4578 3_0_0 EXIST::FUNCTION:SIV OPENSSL_INIT_set_config_filename 4579 3_0_0 EXIST::FUNCTION:STDIO OPENSSL_INIT_set_config_file_flags 4580 3_0_0 EXIST::FUNCTION:STDIO +ASYNC_WAIT_CTX_get_callback 4581 3_0_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_set_callback 4582 3_0_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_set_status 4583 3_0_0 EXIST::FUNCTION: +ASYNC_WAIT_CTX_get_status 4584 3_0_0 EXIST::FUNCTION: diff --git a/util/libssl.num b/util/libssl.num index 6bc668833a..d59ccf9974 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -498,3 +498,8 @@ SSL_CTX_get_recv_max_early_data 498 3_0_0 EXIST::FUNCTION: SSL_CTX_set_recv_max_early_data 499 3_0_0 EXIST::FUNCTION: SSL_CTX_set_post_handshake_auth 500 3_0_0 EXIST::FUNCTION: SSL_get_signature_type_nid 501 3_0_0 EXIST::FUNCTION: +SSL_CTX_set_async_callback 502 3_0_0 EXIST::FUNCTION: +SSL_CTX_set_async_callback_arg 503 3_0_0 EXIST::FUNCTION: +SSL_set_async_callback 504 3_0_0 EXIST::FUNCTION: +SSL_set_async_callback_arg 505 3_0_0 EXIST::FUNCTION: +SSL_get_async_status 506 3_0_0 EXIST::FUNCTION: diff --git a/util/private.num b/util/private.num index 09ab417f69..7a7c73f0da 100644 --- a/util/private.num +++ b/util/private.num @@ -90,6 +90,8 @@ custom_ext_free_cb datatype custom_ext_parse_cb datatype pem_password_cb datatype ssl_ct_validation_cb datatype +ASYNC_callback_fn datatype +SSL_async_callback_fn datatype # BIO_append_filename define BIO_destroy_bio_pair define @@ -475,3 +477,7 @@ X509_STORE_set_verify_func define EVP_PKEY_CTX_set1_id define EVP_PKEY_CTX_get1_id define EVP_PKEY_CTX_get1_id_len define +ASYNC_STATUS_EAGAIN define +ASYNC_STATUS_OK define +ASYNC_STATUS_ERR define +ASYNC_STATUS_UNSUPPORTED define |