diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-05 18:08:05 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-09 02:12:07 +0100 |
| commit | 5e9a8678c5e1442e618ae0abc7b314880ec3ba4e (patch) | |
| tree | 891e3e8015a7251205013419d11223b879efa4d3 | |
| parent | apps/pkcs12: Properly detect MAC setup failure (diff) | |
| download | openssl-5e9a8678c5e1442e618ae0abc7b314880ec3ba4e.tar.xz openssl-5e9a8678c5e1442e618ae0abc7b314880ec3ba4e.zip | |
apps/pkcs12: Detect missing PKCS12KDF support on import
Report error message with hint to use -nomacver if
MAC verification is not required.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14445)
| -rw-r--r-- | apps/pkcs12.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 00c5a9bc4b..c729ab5d67 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -19,6 +19,7 @@ #include <openssl/pem.h> #include <openssl/pkcs12.h> #include <openssl/provider.h> +#include <openssl/kdf.h> #define NOKEYS 0x1 #define NOCERTS 0x2 @@ -733,6 +734,15 @@ int pkcs12_main(int argc, char **argv) tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L); } if (macver) { + EVP_KDF *pkcs12kdf; + + pkcs12kdf = EVP_KDF_fetch(NULL, "PKCS12KDF", NULL); + 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"); + goto end; + } + EVP_KDF_free(pkcs12kdf); /* If we enter empty password try no password first */ if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) { /* If mac and crypto pass the same set it to NULL too */ |