diff options
author | Daiki Ueno <ueno@gnu.org> | 2020-03-25 14:29:36 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2020-03-25 14:29:36 +0000 |
commit | 0b06c99dd730e6239db38553386a26a25c27e6cb (patch) | |
tree | a5c11df9d8dd19ad795e197bddb4705f70d880b9 /lib | |
parent | c78665483dd7b6a222ec071df99ee7333b1e295a (diff) | |
parent | 313f58a4772b905091e1506b0880e2c2014eeb28 (diff) | |
download | gnutls-0b06c99dd730e6239db38553386a26a25c27e6cb.tar.gz |
Merge branch 'tmp-get-keylog-func' into 'master'
gnutls_session_get_keylog_function: new function
See merge request gnutls/gnutls!1220
Diffstat (limited to 'lib')
-rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 1 | ||||
-rw-r--r-- | lib/kx.c | 17 | ||||
-rw-r--r-- | lib/libgnutls.map | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 9fb6afa156..a6c3c0ef30 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -2312,6 +2312,7 @@ void gnutls_global_set_log_level(int level); typedef int (*gnutls_keylog_func) (gnutls_session_t session, const char *label, const gnutls_datum_t *secret); +gnutls_keylog_func gnutls_session_get_keylog_function(const gnutls_session_t session); void gnutls_session_set_keylog_function(gnutls_session_t session, gnutls_keylog_func func); @@ -71,6 +71,23 @@ int _gnutls_generate_master(gnutls_session_t session, int keep_premaster) } /** + * gnutls_session_get_keylog_function: + * @session: is #gnutls_session_t type + * + * This function will return the callback function set using + * gnutls_session_set_keylog_function(). + * + * Returns: The function set or %NULL otherwise. + * + * Since: 3.6.13 + */ +gnutls_keylog_func +gnutls_session_get_keylog_function(const gnutls_session_t session) +{ + return session->internals.keylog_func; +} + +/** * gnutls_session_set_keylog_function: * @session: is #gnutls_session_t type * @func: is the function to be called diff --git a/lib/libgnutls.map b/lib/libgnutls.map index 7c3187541d..5541e9caba 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -1315,6 +1315,7 @@ GNUTLS_3_6_13 gnutls_hkdf_extract; gnutls_hkdf_expand; gnutls_pbkdf2; + gnutls_session_get_keylog_function; gnutls_session_set_keylog_function; gnutls_prf_hash_get; gnutls_psk_server_get_username2; |