aboutsummaryrefslogtreecommitdiffstats
path: root/agent/minip12.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-10-23 10:52:23 +0000
committerWerner Koch <[email protected]>2006-10-23 10:52:23 +0000
commit2a9f9d76a201a470a6212191bb85dfc9cf814301 (patch)
treedad6514d529a4a875135eace6335d4c5057ef897 /agent/minip12.c
parentAllow to select X.509 certificates using the keygrip. (diff)
downloadgnupg-2a9f9d76a201a470a6212191bb85dfc9cf814301.tar.gz
gnupg-2a9f9d76a201a470a6212191bb85dfc9cf814301.zip
Allow importing of web.de generated p12 files
Diffstat (limited to 'agent/minip12.c')
-rw-r--r--agent/minip12.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/agent/minip12.c b/agent/minip12.c
index 536170856..2da118022 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -497,7 +497,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
const unsigned char *p_start = buffer;
size_t n = length;
const char *where;
- char salt[16];
+ char salt[20];
size_t saltlen;
unsigned int iter;
unsigned char *plain = NULL;
@@ -575,7 +575,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
if (parse_tag (&p, &n, &ti))
goto bailout;
if (ti.class || ti.tag != TAG_OCTET_STRING
- || ti.length < 8 || ti.length > 16 )
+ || ti.length < 8 || ti.length > 20 )
goto bailout;
saltlen = ti.length;
memcpy (salt, p, saltlen);
@@ -909,7 +909,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
const unsigned char *p_start = buffer;
size_t n = length;
const char *where;
- char salt[16];
+ char salt[20];
size_t saltlen;
unsigned int iter;
int len;
@@ -997,7 +997,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
if (parse_tag (&p, &n, &ti))
goto bailout;
if (ti.class || ti.tag != TAG_OCTET_STRING
- || ti.length < 8 || ti.length > 16)
+ || ti.length < 8 || ti.length > 20)
goto bailout;
saltlen = ti.length;
memcpy (salt, p, saltlen);