security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/ChangeLog
View File

@ -1,3 +1,12 @@
2006-10-23 Werner Koch <wk@g10code.com>
* minip12.c (parse_bag_encrypted_data, parse_bag_data): Allow for
a salt of 20 bytes.
2006-10-20 Werner Koch <wk@g10code.com>
* Makefile.am (t_common_ldadd): Use GPG_ERROR_LIBS instead -o just -l
2006-10-19 Werner Koch <wk@g10code.com> 2006-10-19 Werner Koch <wk@g10code.com>
* findkey.c (unprotect): Use it to avoid unnecessary calls to * findkey.c (unprotect): Use it to avoid unnecessary calls to

2
agent/Makefile.am
View File

@ -83,7 +83,7 @@ $(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
TESTS = t-protect TESTS = t-protect
t_common_ldadd = $(common_libs) \ t_common_ldadd = $(common_libs) \
$(LIBGCRYPT_LIBS) -lgpg-error $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
t_protect_SOURCES = t-protect.c protect.c t_protect_SOURCES = t-protect.c protect.c
t_protect_LDADD = $(t_common_ldadd) t_protect_LDADD = $(t_common_ldadd)

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; const unsigned char *p_start = buffer;
size_t n = length; size_t n = length;
const char *where; const char *where;
char salt[16]; char salt[20];
size_t saltlen; size_t saltlen;
unsigned int iter; unsigned int iter;
unsigned char *plain = NULL; 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)) if (parse_tag (&p, &n, &ti))
goto bailout; goto bailout;
if (ti.class || ti.tag != TAG_OCTET_STRING if (ti.class || ti.tag != TAG_OCTET_STRING
|| ti.length < 8 || ti.length > 16 ) || ti.length < 8 || ti.length > 20 )
goto bailout; goto bailout;
saltlen = ti.length; saltlen = ti.length;
memcpy (salt, p, saltlen); 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; const unsigned char *p_start = buffer;
size_t n = length; size_t n = length;
const char *where; const char *where;
char salt[16]; char salt[20];
size_t saltlen; size_t saltlen;
unsigned int iter; unsigned int iter;
int len; int len;
@ -997,7 +997,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
if (parse_tag (&p, &n, &ti)) if (parse_tag (&p, &n, &ti))
goto bailout; goto bailout;
if (ti.class || ti.tag != TAG_OCTET_STRING if (ti.class || ti.tag != TAG_OCTET_STRING
|| ti.length < 8 || ti.length > 16) || ti.length < 8 || ti.length > 20)
goto bailout; goto bailout;
saltlen = ti.length; saltlen = ti.length;
memcpy (salt, p, saltlen); memcpy (salt, p, saltlen);