diff options
author | Daiki Ueno <dueno@redhat.com> | 2020-02-17 16:13:35 +0100 |
---|---|---|
committer | Daiki Ueno <dueno@redhat.com> | 2020-02-17 17:51:43 +0100 |
commit | d5f0a8662e843bd3070f4d8653326a40ae9b7932 (patch) | |
tree | 60a2cb98e21c9c852c9ea71aeecf83487b61ab3b | |
parent | 8ab75b3cf7130ad7594b68c6ecba79b6e0c082d9 (diff) | |
download | gnutls-tmp-rename-secret-hook.tar.gz |
gnutls_session_set_secret_function: rename from gnutls_handshake_*tmp-rename-secret-hook
As some of the secrets can be used after the handshake is completed,
the gnutls_session_ namespace is more appropriate for the function.
The names of enum/callback are also shortened.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | devel/libgnutls-latest-x86_64.abi | 2 | ||||
-rw-r--r-- | devel/symbols.last | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 6 | ||||
-rw-r--r-- | doc/manpages/Makefile.am | 2 | ||||
-rw-r--r-- | lib/constate.c | 4 | ||||
-rw-r--r-- | lib/gnutls_int.h | 2 | ||||
-rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 22 | ||||
-rw-r--r-- | lib/kx.c | 12 | ||||
-rw-r--r-- | lib/kx.h | 4 | ||||
-rw-r--r-- | lib/libgnutls.map | 2 | ||||
-rw-r--r-- | lib/state.c | 2 | ||||
-rw-r--r-- | tests/secret-hook.c | 10 |
13 files changed, 37 insertions, 37 deletions
@@ -13,8 +13,8 @@ See the end for copying conditions. gnutls_hkdf_extract: Added gnutls_hkdf_expand: Added gnutls_pbkdf2: Added -gnutls_handshake_secret_type_t: New enumeration -gnutls_handshake_set_secret_function: Added +gnutls_secret_type_t: New enumeration +gnutls_session_set_secret_function: Added * Version 3.6.12 (released 2020-02-01) diff --git a/devel/libgnutls-latest-x86_64.abi b/devel/libgnutls-latest-x86_64.abi index 3a9497697e..f26473ff4a 100644 --- a/devel/libgnutls-latest-x86_64.abi +++ b/devel/libgnutls-latest-x86_64.abi @@ -300,7 +300,7 @@ <elf-symbol name='gnutls_handshake_set_post_client_hello_function' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='gnutls_handshake_set_private_extensions' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='gnutls_handshake_set_random' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> - <elf-symbol name='gnutls_handshake_set_secret_function' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> + <elf-symbol name='gnutls_session_set_secret_function' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='gnutls_handshake_set_timeout' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='gnutls_hash' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='gnutls_hash_copy' version='GNUTLS_3_6_9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> diff --git a/devel/symbols.last b/devel/symbols.last index 037741c562..b582bcaefd 100644 --- a/devel/symbols.last +++ b/devel/symbols.last @@ -267,7 +267,6 @@ gnutls_handshake_set_max_packet_length@GNUTLS_3_4 gnutls_handshake_set_post_client_hello_function@GNUTLS_3_4 gnutls_handshake_set_private_extensions@GNUTLS_3_4 gnutls_handshake_set_random@GNUTLS_3_4 -gnutls_handshake_set_secret_function@GNUTLS_3_6_13 gnutls_handshake_set_timeout@GNUTLS_3_4 gnutls_hash@GNUTLS_3_4 gnutls_hash_copy@GNUTLS_3_6_9 @@ -767,6 +766,7 @@ gnutls_session_set_data@GNUTLS_3_4 gnutls_session_set_id@GNUTLS_3_4 gnutls_session_set_premaster@GNUTLS_3_4 gnutls_session_set_ptr@GNUTLS_3_4 +gnutls_session_set_secret_function@GNUTLS_3_6_13 gnutls_session_set_verify_cert2@GNUTLS_3_4 gnutls_session_set_verify_cert@GNUTLS_3_4 gnutls_session_set_verify_function@GNUTLS_3_4 diff --git a/doc/Makefile.am b/doc/Makefile.am index ef3c40f76c..bf39a3cdef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -556,7 +556,6 @@ ENUMS += enums/gnutls_fips_mode_t ENUMS += enums/gnutls_gost_paramset_t ENUMS += enums/gnutls_group_t ENUMS += enums/gnutls_handshake_description_t -ENUMS += enums/gnutls_handshake_secret_type_t ENUMS += enums/gnutls_init_flags_t ENUMS += enums/gnutls_keygen_types_t ENUMS += enums/gnutls_keyid_flags_t @@ -585,6 +584,7 @@ ENUMS += enums/gnutls_psk_key_flags ENUMS += enums/gnutls_pubkey_flags_t ENUMS += enums/gnutls_rnd_level_t ENUMS += enums/gnutls_sec_param_t +ENUMS += enums/gnutls_secret_type_t ENUMS += enums/gnutls_server_name_type_t ENUMS += enums/gnutls_session_flags_t ENUMS += enums/gnutls_sign_algorithm_t @@ -1084,8 +1084,6 @@ FUNCS += functions/gnutls_handshake_set_private_extensions FUNCS += functions/gnutls_handshake_set_private_extensions.short FUNCS += functions/gnutls_handshake_set_random FUNCS += functions/gnutls_handshake_set_random.short -FUNCS += functions/gnutls_handshake_set_secret_function -FUNCS += functions/gnutls_handshake_set_secret_function.short FUNCS += functions/gnutls_handshake_set_timeout FUNCS += functions/gnutls_handshake_set_timeout.short FUNCS += functions/gnutls_hash @@ -1954,6 +1952,8 @@ FUNCS += functions/gnutls_session_set_premaster FUNCS += functions/gnutls_session_set_premaster.short FUNCS += functions/gnutls_session_set_ptr FUNCS += functions/gnutls_session_set_ptr.short +FUNCS += functions/gnutls_session_set_secret_function +FUNCS += functions/gnutls_session_set_secret_function.short FUNCS += functions/gnutls_session_set_verify_cert FUNCS += functions/gnutls_session_set_verify_cert.short FUNCS += functions/gnutls_session_set_verify_cert2 diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index 14e591e62f..84c7124eb1 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -343,7 +343,6 @@ APIMANS += gnutls_handshake_set_max_packet_length.3 APIMANS += gnutls_handshake_set_post_client_hello_function.3 APIMANS += gnutls_handshake_set_private_extensions.3 APIMANS += gnutls_handshake_set_random.3 -APIMANS += gnutls_handshake_set_secret_function.3 APIMANS += gnutls_handshake_set_timeout.3 APIMANS += gnutls_hash.3 APIMANS += gnutls_hash_copy.3 @@ -778,6 +777,7 @@ APIMANS += gnutls_session_set_data.3 APIMANS += gnutls_session_set_id.3 APIMANS += gnutls_session_set_premaster.3 APIMANS += gnutls_session_set_ptr.3 +APIMANS += gnutls_session_set_secret_function.3 APIMANS += gnutls_session_set_verify_cert.3 APIMANS += gnutls_session_set_verify_cert2.3 APIMANS += gnutls_session_set_verify_function.3 diff --git a/lib/constate.c b/lib/constate.c index a11577d7ba..a650997c1c 100644 --- a/lib/constate.c +++ b/lib/constate.c @@ -197,7 +197,7 @@ _tls13_update_keys(gnutls_session_t session, hs_stage_t stage, char buf[65]; record_state_st *upd_state; record_parameters_st *prev = NULL; - gnutls_handshake_secret_type_t secret_type; + gnutls_secret_type_t secret_type; int ret; /* generate new keys for direction needed and copy old from previous epoch */ @@ -396,7 +396,7 @@ _tls13_set_keys(gnutls_session_t session, hs_stage_t stage, record_state_st *client_write, *server_write; const char *label; unsigned label_size, hsk_len; - gnutls_handshake_secret_type_t secret_type; + gnutls_secret_type_t secret_type; void *ckey, *skey; int ret; diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index cd2adc103d..57a961d9e9 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -1243,7 +1243,7 @@ typedef struct { unsigned int h_type; /* the hooked type */ int16_t h_post; /* whether post-generation/receive */ - gnutls_handshake_secret_func secret_func; + gnutls_secret_callback_t secret_func; /* holds the selected certificate and key. * use _gnutls_selected_certs_deinit() and _gnutls_selected_certs_set() diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 13b6c35659..8eb546c1a0 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -2293,7 +2293,7 @@ void gnutls_global_set_audit_log_function(gnutls_audit_log_func log_func); void gnutls_global_set_log_level(int level); /** - * gnutls_handshake_secret_type_t: + * gnutls_secret_type_t: * @GNUTLS_SECRET_CLIENT_RANDOM: 48 bytes for the master secret (for SSL 3.0, * TLS 1.0, 1.1 and 1.2) * @GNUTLS_SECRET_CLIENT_EARLY_TRAFFIC_SECRET: the early traffic secret for the @@ -2312,7 +2312,7 @@ void gnutls_global_set_log_level(int level); * 1-RTT keys) * * Enumeration of different types of secrets derived during handshake. - * This is used by gnutls_handshake_set_secret_function(). + * This is used by gnutls_session_set_secret_function(). * * Since: 3.6.13 */ @@ -2325,25 +2325,25 @@ typedef enum { GNUTLS_SECRET_SERVER_TRAFFIC_SECRET, GNUTLS_SECRET_EARLY_EXPORTER_SECRET, GNUTLS_SECRET_EXPORTER_SECRET -} gnutls_handshake_secret_type_t; +} gnutls_secret_type_t; /** - * gnutls_handshake_secret_function: + * gnutls_secret_callbacK_t: * @session: the current session - * @type: #gnutls_handshake_secret_type_t + * @type: #gnutls_secret_type_t * @secret: the (const) data of the derived secret. * * Function prototype for secret derivation hooks. It is set using - * gnutls_handshake_set_secret_function(). + * gnutls_session_set_secret_function(). * * Returns: Non zero on error. * Since: 3.6.13 */ -typedef int (*gnutls_handshake_secret_func) (gnutls_session_t session, - gnutls_handshake_secret_type_t type, - const gnutls_datum_t *secret); -void gnutls_handshake_set_secret_function(gnutls_session_t session, - gnutls_handshake_secret_func func); +typedef int (*gnutls_secret_callback_t) (gnutls_session_t session, + gnutls_secret_type_t type, + const gnutls_datum_t *secret); +void gnutls_session_set_secret_function(gnutls_session_t session, + gnutls_secret_callback_t func); /* Diffie-Hellman parameter handling. */ @@ -71,7 +71,7 @@ int _gnutls_generate_master(gnutls_session_t session, int keep_premaster) } /** - * gnutls_handshake_set_secret_function: + * gnutls_session_set_secret_function: * @session: is #gnutls_session_t type * @func: is the function to be called * @@ -81,15 +81,15 @@ int _gnutls_generate_master(gnutls_session_t session, int keep_premaster) * Since: 3.6.13 */ void -gnutls_handshake_set_secret_function(gnutls_session_t session, - gnutls_handshake_secret_func func) +gnutls_session_set_secret_function(gnutls_session_t session, + gnutls_secret_callback_t func) { session->internals.secret_func = func; } int _gnutls_call_secret_func(gnutls_session_t session, - gnutls_handshake_secret_type_t type, + gnutls_secret_type_t type, const uint8_t *data, unsigned size) { @@ -101,7 +101,7 @@ _gnutls_call_secret_func(gnutls_session_t session, } static const char * -secret_type_to_nss_keylog_label(gnutls_handshake_secret_type_t type) +secret_type_to_nss_keylog_label(gnutls_secret_type_t type) { switch (type) { case GNUTLS_SECRET_CLIENT_RANDOM: @@ -128,7 +128,7 @@ secret_type_to_nss_keylog_label(gnutls_handshake_secret_type_t type) int _gnutls_nss_keylog_secret_func(gnutls_session_t session, - gnutls_handshake_secret_type_t type, + gnutls_secret_type_t type, const gnutls_datum_t *secret) { const char *label; @@ -39,14 +39,14 @@ int _gnutls_send_server_crt_request(gnutls_session_t session, int again); int _gnutls_recv_client_certificate_verify_message(gnutls_session_t session); int _gnutls_call_secret_func(gnutls_session_t session, - gnutls_handshake_secret_type_t type, + gnutls_secret_type_t type, const uint8_t *data, unsigned size); void _gnutls_nss_keylog_write(gnutls_session_t session, const char *label, const uint8_t *secret, size_t secret_size); int _gnutls_nss_keylog_secret_func(gnutls_session_t session, - gnutls_handshake_secret_type_t type, + gnutls_secret_type_t type, const gnutls_datum_t *secret); #endif /* GNUTLS_LIB_KX_H */ diff --git a/lib/libgnutls.map b/lib/libgnutls.map index c1aace905e..43968a9f12 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -1315,7 +1315,7 @@ GNUTLS_3_6_13 gnutls_hkdf_extract; gnutls_hkdf_expand; gnutls_pbkdf2; - gnutls_handshake_set_secret_function; + gnutls_session_set_secret_function; } GNUTLS_3_6_12; GNUTLS_FIPS140_3_4 { diff --git a/lib/state.c b/lib/state.c index f33cd5a8bc..8f02abdf79 100644 --- a/lib/state.c +++ b/lib/state.c @@ -589,7 +589,7 @@ int gnutls_init(gnutls_session_t * session, unsigned int flags) (*session)->internals.flags |= INT_FLAG_NO_TLS13; /* Install the default secret function */ - gnutls_handshake_set_secret_function(*session, + gnutls_session_set_secret_function(*session, _gnutls_nss_keylog_secret_func); return 0; diff --git a/tests/secret-hook.c b/tests/secret-hook.c index f4523a6a46..09da66ccda 100644 --- a/tests/secret-hook.c +++ b/tests/secret-hook.c @@ -73,7 +73,7 @@ static pid_t child; #define MSG "Hello TLS" static const char * -secret_type_to_str(gnutls_handshake_secret_type_t type) +secret_type_to_str(gnutls_secret_type_t type) { switch (type) { case GNUTLS_SECRET_CLIENT_RANDOM: @@ -99,11 +99,11 @@ secret_type_to_str(gnutls_handshake_secret_type_t type) static int secret_hook_func(gnutls_session_t session, - gnutls_handshake_secret_type_t type, + gnutls_secret_type_t type, const gnutls_datum_t *secret) { unsigned int *call_count = gnutls_session_get_ptr(session); - static const gnutls_handshake_secret_type_t exp_types[] = { + static const gnutls_secret_type_t exp_types[] = { GNUTLS_SECRET_CLIENT_HANDSHAKE_TRAFFIC_SECRET, GNUTLS_SECRET_SERVER_HANDSHAKE_TRAFFIC_SECRET, GNUTLS_SECRET_EXPORTER_SECRET, @@ -168,7 +168,7 @@ static void client(int fd, const char *prio, unsigned int exp_call_count) gnutls_transport_set_int(session, fd); - gnutls_handshake_set_secret_function(session, secret_hook_func); + gnutls_session_set_secret_function(session, secret_hook_func); /* Perform the TLS handshake */ @@ -279,7 +279,7 @@ static void server(int fd, const char *prio, unsigned int exp_call_count) gnutls_transport_set_int(session, fd); - gnutls_handshake_set_secret_function(session, secret_hook_func); + gnutls_session_set_secret_function(session, secret_hook_func); do { ret = gnutls_handshake(session); |