diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-11 15:51:34 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-11-19 11:36:02 +0100 |
| commit | 61dd4168f5d98cd914a65b7357e4df06a65693ab (patch) | |
| tree | 18327e5b73226542f3316e9ae0ceddb0e10a71d4 /engines | |
| parent | e_loader_attic.c: Remove redundant 'pass phrase' sub-string from try_decode_P... (diff) | |
| download | openssl-61dd4168f5d98cd914a65b7357e4df06a65693ab.tar.xz openssl-61dd4168f5d98cd914a65b7357e4df06a65693ab.zip | |
Allow for PKCS#12 input without MAC in p12_kiss.c and e_loader_attic.c
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_loader_attic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 7d059f5256..8a9b86483f 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -322,7 +322,8 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name, *matchcount = 1; - if (PKCS12_verify_mac(p12, "", 0) + if (!PKCS12_mac_present(p12) + || PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0)) { pass = ""; } else { |