From: Matt Caswell <matt@openssl.org>
Date: Wed, 11 Sep 2019 10:52:47 +0000 (+0100)
Subject: Pass the correct ctx to provider KDF functions
X-Git-Tag: openssl-3.0.0-alpha1~1387
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b3d0423528b049d04b299a8588a32d5c1224717;p=oweals%2Fopenssl.git

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@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9865)
---

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))