[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  4139a0c6ec4633351929fdde728dc984f562c51c (commit)
      from  1f79baa55ee00c64372397292ab9c88b5c373d93 (commit)


- Log -----------------------------------------------------------------
commit 4139a0c6ec4633351929fdde728dc984f562c51c
Author: Arthur Gautier <baloo at superbaloo.net>
Date:   Sun Mar 14 22:23:01 2021 +0000

    EVP_KDF-KB man page: fixup ABI/API change
    
    fixup 7c75f2daf8b50c92bfb5c17fa62136e61f6eb515
          https://github.com/openssl/openssl/pull/14310
    
    Previous commit changes the api, one code sample was left with previous
    API.
    
    CLA: trivial
    Signed-off-by: Arthur Gautier <baloo at superbaloo.net>
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14551)

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

Summary of changes:
 doc/man7/EVP_KDF-KB.pod | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/man7/EVP_KDF-KB.pod b/doc/man7/EVP_KDF-KB.pod
index 2ab3e55076..3020a42a81 100644
--- a/doc/man7/EVP_KDF-KB.pod
+++ b/doc/man7/EVP_KDF-KB.pod
@@ -138,9 +138,7 @@ Label "label", and IV "sixteen bytes iv".
  *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
                                           iv, strlen(iv));
  *p = OSSL_PARAM_construct_end();
- if (EVP_KDF_CTX_set_params(kctx, params) <= 0)
-     error("EVP_KDF_CTX_set_params");
- else if (EVP_KDF_derive(kctx, out, sizeof(out)) <= 0)
+ if (EVP_KDF_derive(kctx, out, sizeof(out), params) <= 0)
      error("EVP_KDF_derive");
 
  EVP_KDF_CTX_free(kctx);