From c04b66b18d1a90f0c6326858e4b8367be5444582 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 17 May 2019 12:35:33 +0200 Subject: [PATCH] Change SSL parameter SSL_session_reused const This function only returns a status and does not modify the parameter. Since similar function are already taking const parameters, also change this function to have a const parameter. Fixes #8934 CLA: trivial Signed-off-by: Arne Schwabe Reviewed-by: Kurt Roeckx Reviewed-by: Matt Caswell Reviewed-by: Matthias St. Pierre Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8945) --- doc/man3/SSL_session_reused.pod | 2 +- include/openssl/ssl.h | 2 +- ssl/ssl_lib.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man3/SSL_session_reused.pod b/doc/man3/SSL_session_reused.pod index 9764c2bb67..7b68e8a8cf 100644 --- a/doc/man3/SSL_session_reused.pod +++ b/doc/man3/SSL_session_reused.pod @@ -8,7 +8,7 @@ SSL_session_reused - query whether a reused session was negotiated during handsh #include - int SSL_session_reused(SSL *ssl); + int SSL_session_reused(const SSL *ssl); =head1 DESCRIPTION diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 60712d069e..b043ffcd9e 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2152,7 +2152,7 @@ size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); # define SSL_cache_hit(s) SSL_session_reused(s) # endif -__owur int SSL_session_reused(SSL *s); +__owur int SSL_session_reused(const SSL *s); __owur int SSL_is_server(const SSL *s); __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 910f82be43..03c768010b 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -4606,7 +4606,7 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, size_t outlen, return ret; } -int SSL_session_reused(SSL *s) +int SSL_session_reused(const SSL *s) { return s->hit; } -- 2.25.1