[svn] GnuPG - r4313 - trunk/agent

[svn author wk]

Author: wk
Date: 2006-10-23 12:52:23 +0200 (Mon, 23 Oct 2006)
New Revision: 4313

Modified:
   trunk/agent/ChangeLog
   trunk/agent/Makefile.am
   trunk/agent/minip12.c
Log:
Allow importing of web.de generated p12 files


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2006-10-20 11:38:48 UTC (rev 4312)
+++ trunk/agent/ChangeLog	2006-10-23 10:52:23 UTC (rev 4313)
@@ -1,3 +1,12 @@
+2006-10-23  Werner Koch  <wk at g10code.com>
+
+	* minip12.c (parse_bag_encrypted_data, parse_bag_data): Allow for
+	a salt of 20 bytes.
+
+2006-10-20  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (t_common_ldadd): Use GPG_ERROR_LIBS instead -o just -l
+
 2006-10-19  Werner Koch  <wk at g10code.com>
 
 	* findkey.c (unprotect): Use it to avoid unnecessary calls to

Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am	2006-10-20 11:38:48 UTC (rev 4312)
+++ trunk/agent/Makefile.am	2006-10-23 10:52:23 UTC (rev 4313)
@@ -83,7 +83,7 @@
 TESTS = t-protect
 
 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_LDADD = $(t_common_ldadd)

Modified: trunk/agent/minip12.c
===================================================================
--- trunk/agent/minip12.c	2006-10-20 11:38:48 UTC (rev 4312)
+++ trunk/agent/minip12.c	2006-10-23 10:52:23 UTC (rev 4313)
@@ -497,7 +497,7 @@
   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 @@
   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 @@
   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 @@
   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);