[svn] GnuPG - r3888 - branches/GNUPG-1-9-BRANCH/agent

[svn author wk]

Author: wk
Date: 2005-09-09 15:48:48 +0200 (Fri, 09 Sep 2005)
New Revision: 3888

Modified:
   branches/GNUPG-1-9-BRANCH/agent/ChangeLog
   branches/GNUPG-1-9-BRANCH/agent/minip12.c
Log:
Fixed yesterdays change.  Importing to Outlook seems to work now.


Modified: branches/GNUPG-1-9-BRANCH/agent/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/ChangeLog	2005-09-09 11:18:08 UTC (rev 3887)
+++ branches/GNUPG-1-9-BRANCH/agent/ChangeLog	2005-09-09 13:48:48 UTC (rev 3888)
@@ -2,6 +2,7 @@
 
 	* minip12.c (p12_build): Oops, array needs to be larger for the
 	certificate.
+	(build_cert_bag): Fixed yesterdays change.
 
 	* command-ssh.c (card_key_available): Let the card handler decide
 	whether the card is supported here.  Also get a short serial

Modified: branches/GNUPG-1-9-BRANCH/agent/minip12.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/minip12.c	2005-09-09 11:18:08 UTC (rev 3887)
+++ branches/GNUPG-1-9-BRANCH/agent/minip12.c	2005-09-09 13:48:48 UTC (rev 3888)
@@ -1409,7 +1409,7 @@
   p += DIM (oid_encryptedData); 
 
   /* 2. Store a [0] tag. */
-  p = store_tag_length (p, 0x80, len[2]);
+  p = store_tag_length (p, 0xa0, len[2]);
 
   /* 3. Store a sequence. */
   p = store_tag_length (p, TAG_SEQUENCE, len[3]);
@@ -1433,7 +1433,7 @@
   p += DIM (data_rc2iter2048);
 
   /* 8. And finally the [0] tag with the encrypted data. */
-  p = store_tag_length (p, 0xa0, buflen);
+  p = store_tag_length (p, 0x80, buflen);
   memcpy (p, buffer, buflen);
   p += buflen;
   certbaglen = p - certbag;