aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2022-09-09 16:19:16 +0000
committerWerner Koch <[email protected]>2022-10-10 07:17:10 +0000
commit94092793f6a23bbd93c7a26add4d1a23a6f9acb7 (patch)
tree1a71d2c75d1d2852d73492218ec3c63f06421bbb
parentwkd: Implement --blacklist option for gpg-wks-client (diff)
downloadgnupg-94092793f6a23bbd93c7a26add4d1a23a6f9acb7.tar.gz
gnupg-94092793f6a23bbd93c7a26add4d1a23a6f9acb7.zip
sm: Fix reporting of bad passphrase error
* sm/minip12.c (p12_parse): Set badpass flag to result in ctx. -- Fixes-commit: 4c14bbf56fb544541bd65f9d6e6e0b81779dcab6 GnuPG-bug-id: 5713, 6037 (cherry picked from commit a47b3a4087349f3873eb04a83dc2a0f512cacf86)
-rw-r--r--sm/minip12.c5
1 files changed, 4 insertions, 1 deletions
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;
}