Index: gnupg-1.4.2/g10/keygen.c
===================================================================
--- gnupg-1.4.2/g10/keygen.c
+++ gnupg-1.4.2/g10/keygen.c
@@ -3243,9 +3243,11 @@
  * Write a keyblock to an output stream
  */
 static int
-write_keyblock( IOBUF out, KBNODE node )
+write_keyblock( IOBUF out, KBNODE keyblock )
 {
-    for( ; node ; node = node->next ) {
+    KBNODE kbctx = NULL, node;
+
+    while ( (node = walk_kbnode (keyblock, &kbctx, 0)) ) {
 	int rc = build_packet( out, node->pkt );
 	if( rc ) {
 	    log_error("build_packet(%d) failed: %s\n",