summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2024-10-01 12:36:16 +0200
committerWerner Koch <wk@gnupg.org>2024-10-01 12:36:16 +0200
commitf50dde6269bd1da5da8776fc9d9f4e66d898f58d (patch)
tree9e237ba7aac298cb4806478c9006fed8dc0ab2f8
parentgpgconf: Add list flag to trusted-key et al. (diff)
downloadgnupg2-f50dde6269bd1da5da8776fc9d9f4e66d898f58d.tar.xz
gnupg2-f50dde6269bd1da5da8776fc9d9f4e66d898f58d.zip
gpgsm: Possible improvement for some rare P12 files.
* sm/minip12.c (parse_shrouded_key_bag): Increase size of salt buffer. -- Reported on the mailing list. The change does not seem to have a big regression risk, thus applied. See below for the mail # ------------------------ >8 ------------------------ https://lists.gnupg.org/pipermail/gnupg-users/2024-September/067312.html
-rw-r--r--sm/minip12.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/minip12.c b/sm/minip12.c
index 028be916a..00ba26d7d 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -1248,7 +1248,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
const unsigned char *data;
size_t datalen;
int intval;
- char salt[20];
+ char salt[32];
size_t saltlen;
char iv[16];
unsigned int iter;