[svn] GnuPG - r3851 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-08-04 22:48:13 +0200 (Thu, 04 Aug 2005)
New Revision: 3851

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keygen.c
Log:
* keygen.c (start_tree): Need to use an actual packet type (which we
can then delete) to start the tree.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-08-04 18:50:54 UTC (rev 3850)
+++ trunk/g10/ChangeLog	2005-08-04 20:48:13 UTC (rev 3851)
@@ -1,3 +1,8 @@
+2005-08-04  David Shaw  <dshaw at jabberwocky.com>
+
+	* keygen.c (start_tree): Need to use an actual packet type (which
+	we can then delete) to start the tree.
+
 2005-08-04  Werner Koch  <wk at g10code.com>
 
 	* export.c (do_export_stream): Skip on-card keys when only subkeys

Modified: trunk/g10/keygen.c
===================================================================
--- trunk/g10/keygen.c	2005-08-04 18:50:54 UTC (rev 3850)
+++ trunk/g10/keygen.c	2005-08-04 20:48:13 UTC (rev 3851)
@@ -2667,7 +2667,14 @@
   PACKET *pkt;
 
   pkt=xmalloc_clear(sizeof(*pkt));
-  pkt->pkttype=PKT_NONE;
+
+  /* We're not acually using a user ID here - this is just an
+     arbitrary choice.  We delete it anyway. */
+
+  pkt->pkttype=PKT_USER_ID;
+  pkt->pkt.user_id=xmalloc_clear(sizeof *pkt->pkt.user_id);
+  pkt->pkt.user_id->ref=1;
+
   *tree=new_kbnode(pkt);
   delete_kbnode(*tree);
 }