[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  de3379c94133b5152c344a2cf9d9d3f89a35ee20 (commit)
       via  8975b76efa73dfb68780f5e5751424ec5e427bdc (commit)
      from  842d61b5177bb57b7de374a3f25adc9e07e269d8 (commit)


- Log -----------------------------------------------------------------
commit de3379c94133b5152c344a2cf9d9d3f89a35ee20
Author: EasySec <easy.sec at free.fr>
Date:   Wed May 5 17:59:29 2021 +0200

    find-doc-nits fix courtesy Rich Salz
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11481)

commit 8975b76efa73dfb68780f5e5751424ec5e427bdc
Author: EasySec <easy.sec at free.fr>
Date:   Tue Apr 7 16:59:47 2020 +0200

    use LHASH_OF(TYPE) macro to make the example consistent with the declaration in ssl.h
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11481)

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

Summary of changes:
 doc/man3/SSL_CTX_sessions.pod | 2 +-
 util/find-doc-nits            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man3/SSL_CTX_sessions.pod b/doc/man3/SSL_CTX_sessions.pod
index 5c28ebc272..0347b700f4 100644
--- a/doc/man3/SSL_CTX_sessions.pod
+++ b/doc/man3/SSL_CTX_sessions.pod
@@ -8,7 +8,7 @@ SSL_CTX_sessions - access internal session cache
 
  #include <openssl/ssl.h>
 
- struct lhash_st *SSL_CTX_sessions(SSL_CTX *ctx);
+ LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
 
 =head1 DESCRIPTION
 
diff --git a/util/find-doc-nits b/util/find-doc-nits
index 60a2b8c6a0..a5ea78706d 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -351,6 +351,7 @@ sub name_synopsis {
 
         my $sym;
         my $is_prototype = 1;
+        $line =~ s/LHASH_OF\([^)]+\)/int/g;
         $line =~ s/STACK_OF\([^)]+\)/int/g;
         $line =~ s/SPARSE_ARRAY_OF\([^)]+\)/int/g;
         $line =~ s/__declspec\([^)]+\)//;