security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Allow importing of web.de generated p12 files

Browse source
This commit is contained in:
Werner Koch 2006-10-23 10:52:23 +00:00
parent 58785c880d
commit 2a9f9d76a2
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
agent/minip12.c
View file

@ -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);