diff options
| author | David Shaw <[email protected]> | 2005-08-04 21:41:11 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-08-04 21:41:11 +0000 |
| commit | a4563ecd193c39a84f1ad2122cf01d028b48aba2 (patch) | |
| tree | a1bbe6d3ceb9e8ed57f91ace1009cc063783bde5 | |
| parent | Revert bad patch. (diff) | |
| download | gnupg-a4563ecd193c39a84f1ad2122cf01d028b48aba2.tar.gz gnupg-a4563ecd193c39a84f1ad2122cf01d028b48aba2.zip | |
* keygen.c (write_keyblock): Don't try and build deleted kbnodes since
we start our tree with one.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/keygen.c | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7b0d67c01..1204e7246 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,7 +1,7 @@ 2005-08-04 David Shaw <[email protected]> - * keygen.c (start_tree): Need to use an actual packet type (which - we can then delete) to start the tree. + * keygen.c (write_keyblock): Don't try and build deleted kbnodes + since we start our tree with one. 2005-08-04 Werner Koch <[email protected]> diff --git a/g10/keygen.c b/g10/keygen.c index a657c13c9..44a920464 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3222,15 +3222,21 @@ generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock, static int write_keyblock( IOBUF out, KBNODE node ) { - for( ; node ; node = node->next ) { - int rc = build_packet( out, node->pkt ); - if( rc ) { - log_error("build_packet(%d) failed: %s\n", + for( ; node ; node = node->next ) + { + if(!is_deleted_kbnode(node)) + { + int rc = build_packet( out, node->pkt ); + if( rc ) + { + log_error("build_packet(%d) failed: %s\n", node->pkt->pkttype, g10_errstr(rc) ); - return G10ERR_WRITE_FILE; + return G10ERR_WRITE_FILE; + } } } - return 0; + + return 0; } |