[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6b3d0423528b049d04b299a8588a32d5c1224717 (commit)
      from  252a3665e4c24a387e86ff4e07159f8e846adebc (commit)


- Log -----------------------------------------------------------------
commit 6b3d0423528b049d04b299a8588a32d5c1224717
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 11 11:52:47 2019 +0100

    Pass the correct ctx to provider KDF functions
    
    Make sure we pass the provider side ctx and not the libcrypto side ctx.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9865)

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

Summary of changes:
 crypto/evp/kdf_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index dedb250988..9f055a61d0 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -117,7 +117,7 @@ size_t EVP_KDF_size(EVP_KDF_CTX *ctx)
 
     *params = OSSL_PARAM_construct_size_t(OSSL_KDF_PARAM_SIZE, &s);
     if (ctx->meth->get_ctx_params != NULL
-        && ctx->meth->get_ctx_params(ctx, params))
+        && ctx->meth->get_ctx_params(ctx->data, params))
             return s;
     if (ctx->meth->get_params != NULL
         && ctx->meth->get_params(params))