The branch master has been updated via 7588660a534a9f154e1e25aa763964d507af8aab (commit) from 5d120511679ed69669e29b374a3bab1c50ff5134 (commit)
- Log ----------------------------------------------------------------- commit 7588660a534a9f154e1e25aa763964d507af8aab Author: Shigeki Ohtsu <oh...@ohtsu.org> Date: Fri Jun 7 11:49:48 2019 +0900 Fix doc to remove const arg in GEN_SESSION_CB ae3947de095 changed the callback arg not to have a const parameter. CLA: trivial Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9104) ----------------------------------------------------------------------- Summary of changes: doc/man3/SSL_CTX_set_generate_session_id.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man3/SSL_CTX_set_generate_session_id.pod b/doc/man3/SSL_CTX_set_generate_session_id.pod index 8bf8e15..d90b138 100644 --- a/doc/man3/SSL_CTX_set_generate_session_id.pod +++ b/doc/man3/SSL_CTX_set_generate_session_id.pod @@ -10,7 +10,7 @@ SSL_has_matching_session_id, GEN_SESSION_CB #include <openssl/ssl.h> - typedef int (*GEN_SESSION_CB)(const SSL *ssl, unsigned char *id, + typedef int (*GEN_SESSION_CB)(SSL *ssl, unsigned char *id, unsigned int *id_len); int SSL_CTX_set_generate_session_id(SSL_CTX *ctx, GEN_SESSION_CB cb); @@ -98,7 +98,7 @@ server id given, and will fill the rest with pseudo random bytes: const char session_id_prefix = "www-18"; #define MAX_SESSION_ID_ATTEMPTS 10 - static int generate_session_id(const SSL *ssl, unsigned char *id, + static int generate_session_id(SSL *ssl, unsigned char *id, unsigned int *id_len) { unsigned int count = 0;