From: Pauli <pauli@openssl.org>
Date: Thu, 10 Jun 2021 01:27:44 +0000 (+1000)
Subject: pkcs12: use the app's libctx and property query when searching for algorithms
X-Git-Tag: openssl-3.0.0-beta1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09495e4301ea5805b51c8128f99587de64a20b6c;p=thirdparty%2Fopenssl.git

pkcs12: use the app's libctx and property query when searching for algorithms

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15687)
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 90550b1f44c..5df5cb78ced 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -763,7 +763,8 @@ int pkcs12_main(int argc, char **argv)
     if (macver) {
         EVP_KDF *pkcs12kdf;
 
-        pkcs12kdf = EVP_KDF_fetch(NULL, "PKCS12KDF", NULL);
+        pkcs12kdf = EVP_KDF_fetch(app_get0_libctx(), "PKCS12KDF",
+                                  app_get0_propq());
         if (pkcs12kdf == NULL) {
             BIO_printf(bio_err, "Error verifying PKCS12 MAC; no PKCS12KDF support.\n");
             BIO_printf(bio_err, "Use -nomacver if MAC verification is not required.\n");