From a47b3a4087349f3873eb04a83dc2a0f512cacf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Fri, 9 Sep 2022 18:19:16 +0200 Subject: [PATCH] sm: Fix reporting of bad passphrase error * sm/minip12.c (p12_parse): Set badpass flag to result in ctx. -- Fixes-commit: a4e04375e84ecb7ea0d02e153cb27988fca4c2d0 GnuPG-bug-id: 5713, 6037 --- sm/minip12.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sm/minip12.c b/sm/minip12.c index ad29fc24d..29b48984e 100644 --- a/sm/minip12.c +++ b/sm/minip12.c @@ -1946,7 +1946,10 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw, where = "bag.encryptedData"; consumed = 0; if (parse_bag_encrypted_data (&ctx, p, n, (p - p_start), &consumed)) - goto bailout; + { + *r_badpass = ctx.badpass; + goto bailout; + } if (lenndef) len += consumed; }