[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  81280137a1f33685d7d7fc531ea8fbac38e9a4b7 (commit)
      from  c6ee5d5b42e27b407dfc1fc8845e08c5a75e2221 (commit)


- Log -----------------------------------------------------------------
commit 81280137a1f33685d7d7fc531ea8fbac38e9a4b7
Author: Pauli <pauli at openssl.org>
Date:   Wed Sep 8 09:28:57 2021 +1000

    Fix the example SSH KDF code.
    
    A salt was being set instead of a session ID.
    
    Fixes #16525
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16550)

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

Summary of changes:
 doc/man7/EVP_KDF-SSHKDF.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man7/EVP_KDF-SSHKDF.pod b/doc/man7/EVP_KDF-SSHKDF.pod
index 74d1b71aca..08369abff1 100644
--- a/doc/man7/EVP_KDF-SSHKDF.pod
+++ b/doc/man7/EVP_KDF-SSHKDF.pod
@@ -121,7 +121,7 @@ This example derives an 8 byte IV using SHA-256 with a 1K "key" and appropriate
                                           key, (size_t)1024);
  *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_XCGHASH,
                                           xcghash, (size_t)32);
- *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
+ *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_SESSION_ID,
                                           session_id, (size_t)32);
  *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_SSHKDF_TYPE,
                                          &type, sizeof(type));