]> git.ipfire.org Git - thirdparty/openssl.git/commit
OSSL_STORE and PKCS#12: Check if there is a MAC to verify before prompting
authorRichard Levitte <levitte@openssl.org>
Tue, 13 Jun 2023 18:06:04 +0000 (20:06 +0200)
committerPauli <pauli@openssl.org>
Sun, 25 Jun 2023 22:00:52 +0000 (08:00 +1000)
commit7a520619c997146639f42ce8595162ac34c2ad41
tree7f5610cb31129f1e509395e0a8a4a0c203ab81a8
parentc5f55a4605a56655b2706c72388c1d59141fd243
OSSL_STORE and PKCS#12: Check if there is a MAC to verify before prompting

When a DER object with unknown contents comes all the way to
ossl_store_handle_load_result(), and it attempts to decode them as different
objects, the PKCS#12 decoding attempt would (almost) always prompt for a
passphrase, even if there isn't a MAC to verify it against in the PKCS#12
object.

This change checks if there is a MAC to verify against before attempting to
prompt for a passphrase, leading to less surprising behavior.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21197)
crypto/store/store_result.c