From 697d54cecaa5d216f8329d5d24d903aafedb2d5b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 14 Nov 2023 09:47:13 +0100 Subject: [PATCH] gpgsm: Re-introduce the bad passphrase hint for pkcs#12. * sm/minip12.c (parse_bag_encrypted_data): Set the badpass flag. (parse_shrouded_key_bag): Ditto. -- --- sm/minip12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sm/minip12.c b/sm/minip12.c index 1b5986f7e..84f5dbecb 100644 --- a/sm/minip12.c +++ b/sm/minip12.c @@ -1662,6 +1662,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv) if (!datalen) { err = gpg_error (GPG_ERR_DECRYPT_FAILED); + ctx->badpass = 1; /* This is the most likley reason. */ goto bailout; } @@ -2187,6 +2188,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv) if (!datalen) { err = gpg_error (GPG_ERR_DECRYPT_FAILED); + ctx->badpass = 1; goto bailout; }