[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  d270a6c9ea9f240f653a98c7eb0a5c2134a5d63a (commit)
      from  8d257d0dc6ed9d5aeb8366de6be0af01538557ea (commit)


- Log -----------------------------------------------------------------
commit d270a6c9ea9f240f653a98c7eb0a5c2134a5d63a
Author: Arne Schwabe <arne at rfc2549.org>
Date:   Sat Sep 18 05:04:39 2021 +0200

    Add missing mention of mandatory function OSSL_FUNC_keymgmt_has
    
    The manual page provider-keymgmt.pod is missing the mention of the
    required function OSSL_FUNC_keymgmt_has. The function
    keymgmt_from_algorithm raise EVP_R_INVALID_PROVIDER_FUNCTIONS
    if keymgmt->has == NULL
    
    CLA: trivial
    Signed-off-by: Arne Schwabe <arne at rfc2549.org>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16621)
    
    (cherry picked from commit 56b8f434c7da35b4de16603faad4170eb1d80710)

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

Summary of changes:
 doc/man7/provider-keymgmt.pod | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod
index 000c8cab3f..25b822b47d 100644
--- a/doc/man7/provider-keymgmt.pod
+++ b/doc/man7/provider-keymgmt.pod
@@ -254,9 +254,10 @@ provider knows how to interpret, but that may come from other operations.
 Outside the provider, this reference is simply an array of bytes.
 
 At least one of OSSL_FUNC_keymgmt_new(), OSSL_FUNC_keymgmt_gen() and
-OSSL_FUNC_keymgmt_load() are mandatory, as well as OSSL_FUNC_keymgmt_free().
-Additionally, if OSSL_FUNC_keymgmt_gen() is present, OSSL_FUNC_keymgmt_gen_init()
-and OSSL_FUNC_keymgmt_gen_cleanup() must be present as well.
+OSSL_FUNC_keymgmt_load() are mandatory, as well as OSSL_FUNC_keymgmt_free() and
+OSSL_FUNC_keymgmt_has(). Additionally, if OSSL_FUNC_keymgmt_gen() is present, 
+OSSL_FUNC_keymgmt_gen_init() and OSSL_FUNC_keymgmt_gen_cleanup() must be
+present as well.
 
 =head2 Key Object Information Functions