* call-agent.c (agent_scd_getattr): Don't clear the passed info

structure, so that it can indeed be updated.

* card-util.c (fpr_is_zero): New.
(generate_card_keys): New.
(card_edit): New command "generate".
* keygen.c (generate_keypair): New arg CARD_SERIALNO, removed call
to check_smartcard.
(check_smartcard,show_smartcard): Removed.
(show_sha1_fpr,fpr_is_zero): Removed.

* app-openpgp.c (do_getattr): Support SERIALNO and AID.

1 files changed, 2 insertions, 2 deletions

diff --git a/g10/g10.c b/g10/g10.c
index cdd10d845..984e50d9c 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2555,12 +2555,12 @@ main( int argc, char **argv )
 	if( opt.batch ) {
 	    if( argc > 1 )
 		wrong_args("--gen-key [parameterfile]");
-	    generate_keypair( argc? *argv : NULL );
+	    generate_keypair( argc? *argv : NULL, NULL );
 	}
 	else {
 	    if( argc )
 		wrong_args("--gen-key");
-	    generate_keypair(NULL);
+	    generate_keypair(NULL, NULL);
 	}
 	break;