Add documentation for SSL_CTX_set_psk_use_session_callback()
authorMatt Caswell <matt@openssl.org>
Fri, 16 Jun 2017 13:30:10 +0000 (14:30 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 21 Jun 2017 13:45:35 +0000 (14:45 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

doc/man3/SSL_CTX_set_psk_client_callback.pod
include/openssl/ssl.h

index 6aa60bb2061abc48ad275c51200944b6797f38ca..9a1595964b387641a213ed03cfb813712b30ae97 100644 (file)
@@ -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
 
index 83099615dfb60dde6305e23506a1ea8f63be763d..c0d3904a491deff12254d81885f745e6c5f1ec7f 100644 (file)
@@ -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. */