]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
pkcs12: use the app's libctx and property query when searching for algorithms
authorPauli <pauli@openssl.org>
Thu, 10 Jun 2021 01:27:44 +0000 (11:27 +1000)
committerPauli <pauli@openssl.org>
Tue, 15 Jun 2021 08:26:47 +0000 (18:26 +1000)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15687)

apps/pkcs12.c

index 90550b1f44c2e18da48da34f5714bb912651a971..5df5cb78ced33cad75d6f36f26f1202bca86fee0 100644 (file)
@@ -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");