[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6d55d27b2da7a84c9f4b872060be979b5f64af2c (commit)
       via  48b3ad05680ba3e3668bcb6491bf4447033464ed (commit)
       via  b9f96f30eea550650a8d9f8000cea940c6ee8150 (commit)
      from  e567367afd2e3339597e984fa3ae2fecad4d6735 (commit)


- Log -----------------------------------------------------------------
commit 6d55d27b2da7a84c9f4b872060be979b5f64af2c
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Sep 3 15:18:02 2021 +0800

    fix documentation error caused by commit 6882652e65d39310c98ba506ceb55a87c702d419
    
    CLA:trivial
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16502)

commit 48b3ad05680ba3e3668bcb6491bf4447033464ed
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Sep 3 15:09:54 2021 +0800

     fix documentation error caused by commit 9067cf6ccdce0a73922f06937e54c2fce2752038
    
    CLA:trivial
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16502)

commit b9f96f30eea550650a8d9f8000cea940c6ee8150
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Sep 3 14:40:17 2021 +0800

     imporve documentation
    
    CLA:trivial
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16502)

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

Summary of changes:
 doc/internal/man3/ossl_method_construct.pod | 12 +++++-------
 doc/man3/OSSL_STORE_LOADER.pod              |  8 ++++----
 doc/man3/X509_digest.pod                    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/doc/internal/man3/ossl_method_construct.pod b/doc/internal/man3/ossl_method_construct.pod
index d2202bccfa..b05ea9845c 100644
--- a/doc/internal/man3/ossl_method_construct.pod
+++ b/doc/internal/man3/ossl_method_construct.pod
@@ -10,15 +10,13 @@ OSSL_METHOD_CONSTRUCT_METHOD, ossl_method_construct
  #include "internal/core.h"
 
  struct ossl_method_construct_method_st {
-     /* Create store */
-     void *(*alloc_tmp_store)(OSSL_LIB_CTX *ctx);
-     /* Remove a store */
-     void (*dealloc_tmp_store)(void *store);
+     /* Get a temporary store */
+     void *(*get_tmp_store)(void *data);
      /* Get an already existing method from a store */
-     void *(*get)(OSSL_LIB_CTX *libctx, void *store, void *data);
+     void *(*get)(void *store, void *data);
      /* Store a method in a store */
-     int (*put)(OSSL_LIB_CTX *libctx, void *store, void *method,
-                const OSSL_PROVIDER *prov, int operation_id, const char *name,
+     int (*put)(void *store, void *method,
+                const OSSL_PROVIDER *prov, const char *name,
                 const char *propdef, void *data);
      /* Construct a new method */
      void *(*construct)(const char *name, const OSSL_DISPATCH *fns,
diff --git a/doc/man3/OSSL_STORE_LOADER.pod b/doc/man3/OSSL_STORE_LOADER.pod
index d150d24b49..fc1153eb21 100644
--- a/doc/man3/OSSL_STORE_LOADER.pod
+++ b/doc/man3/OSSL_STORE_LOADER.pod
@@ -45,9 +45,9 @@ unregister STORE loaders for different URI schemes
  int OSSL_STORE_LOADER_is_a(const OSSL_STORE_LOADER *loader,
                             const char *scheme);
  void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                        void (*fn)(OSSL_STORE_LOADER *loader,
+                                        void (*user_fn)(OSSL_STORE_LOADER *loader,
                                                    void *arg),
-                                        void *arg);
+                                        void *user_arg);
  int OSSL_STORE_LOADER_names_do_all(const OSSL_STORE_LOADER *loader,
                                     void (*fn)(const char *name, void *data),
                                     void *data);
@@ -142,8 +142,8 @@ I<loader> implementation.
 
 OSSL_STORE_LOADER_do_all_provided() traverses all store implementations
 by all activated providers in the library context I<libctx>, and for each
-of the implementations, calls I<fn> with the implementation method and
-I<data> as arguments.
+of the implementations, calls I<user_fn> with the implementation method and
+I<user_arg> as arguments.
 
 OSSL_STORE_LOADER_names_do_all() traverses all names for the given
 I<loader>, and calls I<fn> with each name and I<data>.
diff --git a/doc/man3/X509_digest.pod b/doc/man3/X509_digest.pod
index 8213bd06ca..f4921dbc18 100644
--- a/doc/man3/X509_digest.pod
+++ b/doc/man3/X509_digest.pod
@@ -67,7 +67,7 @@ to a place where the digest size will be stored.
 
 =head1 RETURN VALUES
 
-X509_digest_sig() returns an ASN1_OCTET_STRING on success, else NULL.
+X509_digest_sig() returns an ASN1_OCTET_STRING pointer on success, else NULL.
 
 All other functions described here return 1 for success and 0 for failure.