* cardglue.c (pin_cb): Detect whether an admin or regular PIN is

requested.
(genkey_status_cb): New.
(agent_scd_genkey): Implemented.

* keygen.c (generate_keypair): New arg CARD_SERIALNO and prepare
parameters for on card key generation. Changed all callers.
(do_generate_keypair): Add new arg card and merged casrd specific
changes from 1.9.
(proc_parameter_file): New arg card, apss it down to
do_generate_keypair and changed all callers.
(gen_card_key): New.

* g10.c: Include cardclue.h.
(main): s/app_set_default_reader_port/card_set_reader_port/.
* cardglue.c (card_set_reader_port): New to address include file
issues.

1 files changed, 4 insertions, 3 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 70b9bd300..d925c364a 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -51,6 +51,7 @@
 #include "g10defs.h"
 #include "keyserver-internal.h"
 #include "exec.h"
+#include "cardglue.h"
 
 enum cmd_and_opt_values
   {
@@ -1425,7 +1426,7 @@ main( int argc, char **argv )
           case aCardEdit: set_cmd (&cmd, aCardEdit); break;
           case aChangePIN: set_cmd (&cmd, aChangePIN); break;
           case oReaderPort:
-            app_set_default_reader_port (pargs.r.ret_str);
+            card_set_reader_port (pargs.r.ret_str);
             break;
           case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
           case opcscDriver: opt.pcsc_driver = pargs.r.ret_str; break;
@@ -2603,12 +2604,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;