[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  c04b66b18d1a90f0c6326858e4b8367be5444582 (commit)
      from  9830e7ea42b9c0f95ea1f4b09aa2e60fa7d3115f (commit)


- Log -----------------------------------------------------------------
commit c04b66b18d1a90f0c6326858e4b8367be5444582
Author: Arne Schwabe <arne at rfc2549.org>
Date:   Fri May 17 12:35:33 2019 +0200

    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 <arne at rfc2549.org>
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8945)

-----------------------------------------------------------------------

Summary of changes:
 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 9764c2b..7b68e8a 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 <openssl/ssl.h>
 
- 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 60712d0..b043ffc 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 910f82b..03c7680 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;
 }