From bf4728992fb072ff24ab459d3aa8777a54220e30 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 4 Aug 2005 20:48:13 +0000 Subject: [PATCH] * keygen.c (start_tree): Need to use an actual packet type (which we can then delete) to start the tree. --- g10/ChangeLog | 5 +++++ g10/keygen.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 2f1ba5bbc..7b0d67c01 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2005-08-04 David Shaw + + * 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 * export.c (do_export_stream): Skip on-card keys when only subkeys diff --git a/g10/keygen.c b/g10/keygen.c index a657c13c9..4ff68941e 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2667,7 +2667,14 @@ start_tree(KBNODE *tree) 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); }