mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
* keygen.c (write_keyblock): Don't try and build deleted kbnodes since
we start our tree with one.
This commit is contained in:
parent
5ce7563171
commit
a4563ecd19
@ -1,7 +1,7 @@
|
|||||||
2005-08-04 David Shaw <dshaw@jabberwocky.com>
|
2005-08-04 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* keygen.c (start_tree): Need to use an actual packet type (which
|
* keygen.c (write_keyblock): Don't try and build deleted kbnodes
|
||||||
we can then delete) to start the tree.
|
since we start our tree with one.
|
||||||
|
|
||||||
2005-08-04 Werner Koch <wk@g10code.com>
|
2005-08-04 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
10
g10/keygen.c
10
g10/keygen.c
@ -3222,14 +3222,20 @@ generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock,
|
|||||||
static int
|
static int
|
||||||
write_keyblock( IOBUF out, KBNODE node )
|
write_keyblock( IOBUF out, KBNODE node )
|
||||||
{
|
{
|
||||||
for( ; node ; node = node->next ) {
|
for( ; node ; node = node->next )
|
||||||
|
{
|
||||||
|
if(!is_deleted_kbnode(node))
|
||||||
|
{
|
||||||
int rc = build_packet( out, node->pkt );
|
int rc = build_packet( out, node->pkt );
|
||||||
if( rc ) {
|
if( rc )
|
||||||
|
{
|
||||||
log_error("build_packet(%d) failed: %s\n",
|
log_error("build_packet(%d) failed: %s\n",
|
||||||
node->pkt->pkttype, g10_errstr(rc) );
|
node->pkt->pkttype, g10_errstr(rc) );
|
||||||
return G10ERR_WRITE_FILE;
|
return G10ERR_WRITE_FILE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user