diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-16 14:30:10 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-21 14:45:35 +0100 |
| commit | 801d9fbd97e5f29b19851562a72b8be4c5fd0783 (patch) | |
| tree | 6bdd967fa4fb8cf74c6f579d8e4d77d4db219de5 | |
| parent | 9c39fa1e38d0973787e32799a28a46a2812aba2b (diff) | |
Add documentation for SSL_CTX_set_psk_use_session_callback()
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
| -rw-r--r-- | doc/man3/SSL_CTX_set_psk_client_callback.pod | 7 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod index 6aa60bb206..9a1595964b 100644 --- a/doc/man3/SSL_CTX_set_psk_client_callback.pod +++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod @@ -8,6 +8,11 @@ SSL_CTX_set_psk_client_callback, SSL_set_psk_client_callback - set PSK client ca #include <openssl/ssl.h> + typedef int (*SSL_psk_use_session_cb_func)(SSL *ssl, const EVP_MD *md, + const unsigned char **id, + size_t *idlen, + SSL_SESSION **sess); + void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, unsigned int (*callback)(SSL *ssl, const char *hint, char *identity, unsigned int max_identity_len, @@ -17,6 +22,8 @@ SSL_CTX_set_psk_client_callback, SSL_set_psk_client_callback - set PSK client ca char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len)); + void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx, + SSL_psk_use_session_cb_func cb); =head1 DESCRIPTION diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 83099615df..c0d3904a49 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -786,7 +786,7 @@ void SSL_CTX_set_psk_find_session_callback(SSL_CTX *ctx, SSL_psk_find_session_cb_func cb); void SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb); void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx, - SSL_psk_use_session_cb_func cb); + SSL_psk_use_session_cb_func cb); /* Register callbacks to handle custom TLS Extensions for client or server. */ |