From a9c0d8beeae98355a2ef6ae1f0a9ba624be8bd54 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 7 Sep 2017 18:39:40 -0400 Subject: Rename SSL_CTX_set_early_cb to SSL_CTX_set_client_hello_cb. "Early callback" is a little ambiguous now that early data exists. Perhaps "ClientHello callback"? Reviewed-by: Rich Salz Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/4349) --- util/libssl.num | 18 +++++++++--------- util/private.num | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'util') diff --git a/util/libssl.num b/util/libssl.num index efbd079f4b..1d8f8ab525 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -416,14 +416,14 @@ SSL_get_peer_signature_type_nid 416 1_1_1 EXIST::FUNCTION: SSL_key_update 417 1_1_1 EXIST::FUNCTION: SSL_get_key_update_type 418 1_1_1 EXIST::FUNCTION: SSL_bytes_to_cipher_list 419 1_1_1 EXIST::FUNCTION: -SSL_early_get0_compression_methods 420 1_1_1 EXIST::FUNCTION: -SSL_early_get0_ciphers 421 1_1_1 EXIST::FUNCTION: -SSL_early_get0_ext 422 1_1_1 EXIST::FUNCTION: -SSL_early_get0_session_id 423 1_1_1 EXIST::FUNCTION: -SSL_early_get0_random 424 1_1_1 EXIST::FUNCTION: -SSL_CTX_set_early_cb 425 1_1_1 EXIST::FUNCTION: -SSL_early_get0_legacy_version 426 1_1_1 EXIST::FUNCTION: -SSL_early_isv2 427 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_compression_methods 420 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_ciphers 421 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_ext 422 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_session_id 423 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_random 424 1_1_1 EXIST::FUNCTION: +SSL_CTX_set_client_hello_cb 425 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get0_legacy_version 426 1_1_1 EXIST::FUNCTION: +SSL_client_hello_isv2 427 1_1_1 EXIST::FUNCTION: SSL_set_max_early_data 428 1_1_1 EXIST::FUNCTION: SSL_CTX_set_max_early_data 429 1_1_1 EXIST::FUNCTION: SSL_get_max_early_data 430 1_1_1 EXIST::FUNCTION: @@ -450,7 +450,7 @@ SSL_set_block_padding 450 1_1_1 EXIST::FUNCTION: SSL_set_record_padding_callback_arg 451 1_1_1 EXIST::FUNCTION: SSL_CTX_set_record_padding_callback_arg 452 1_1_1 EXIST::FUNCTION: SSL_CTX_use_serverinfo_ex 453 1_1_1 EXIST::FUNCTION: -SSL_early_get1_extensions_present 454 1_1_1 EXIST::FUNCTION: +SSL_client_hello_get1_extensions_present 454 1_1_1 EXIST::FUNCTION: SSL_set_psk_find_session_callback 455 1_1_1 EXIST::FUNCTION: SSL_set_psk_use_session_callback 456 1_1_1 EXIST::FUNCTION: SSL_CTX_set_psk_use_session_callback 457 1_1_1 EXIST::FUNCTION: diff --git a/util/private.num b/util/private.num index 242de12e5f..d705613a0c 100644 --- a/util/private.num +++ b/util/private.num @@ -36,7 +36,7 @@ OSSL_STORE_open_fn datatype OSSL_STORE_post_process_info_fn datatype RAND_poll_cb datatype SSL_CTX_keylog_cb_func datatype -SSL_early_cb_fn datatype +SSL_client_hello_cb_fn datatype SSL_psk_client_cb_func datatype SSL_psk_find_session_cb_func datatype SSL_psk_server_cb_func datatype @@ -349,7 +349,7 @@ SSL_set_tlsext_status_type define SSL_set_tmp_dh define SSL_want_async define SSL_want_async_job define -SSL_want_early define +SSL_want_client_hello_cb define SSL_want_nothing define SSL_want_read define SSL_want_write define -- cgit v1.2.3