[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  a64a143f314c00937c14b61157e4ea934f3c6b69 (commit)
      from  6985b0e3deaee2f6e83a670ce7b33cf9ee47933a (commit)


- Log -----------------------------------------------------------------
commit a64a143f314c00937c14b61157e4ea934f3c6b69
Author: Jaimee Brown <jaimee.brown at oracle.com>
Date:   Wed Jun 3 14:28:06 2020 +1000

    Minor doc fix for EVP_PKEY_CTX_new_from_pkey
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/12021)

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

Summary of changes:
 doc/man3/EVP_PKEY_CTX_new.pod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man3/EVP_PKEY_CTX_new.pod b/doc/man3/EVP_PKEY_CTX_new.pod
index b1f3185b94..4430967d19 100644
--- a/doc/man3/EVP_PKEY_CTX_new.pod
+++ b/doc/man3/EVP_PKEY_CTX_new.pod
@@ -16,7 +16,8 @@ EVP_PKEY_CTX_new_from_pkey, EVP_PKEY_CTX_dup, EVP_PKEY_CTX_free
                                           const char *name,
                                           const char *propquery);
  EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_pkey(OPENSSL_CTX *libctx,
-                                          EVP_PKEY *pkey);
+                                          EVP_PKEY *pkey,
+                                          const char *propquery);
  EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *ctx);
  void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);