* options.h (DBG_CIPHER): Reintroduced it.

* seskey.c (encode_session_key): Debug output of the session key.

* pubkey-enc.c (get_it): Handle card case.
* call-agent.c (agent_scd_pkdecrypt): New.
* pkglue.c (pk_encrypt): Add RSA support.

* g10.c (main): Default to --use-agent.

* keygen.c (show_smartcard): Print info about the public key.
(check_smartcard): Check for existing key here.
(gen_card_key): And not anymore here.
(fpr_is_zero): New.
(generate_keypair): Generate both keys for a card.
(smartcard_change_url): Nw.

1 files changed, 4 insertions, 0 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 6909e0404..d48dada5e 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1228,6 +1228,7 @@ main( int argc, char **argv )
     opt.verify_options=VERIFY_SHOW_POLICY|VERIFY_SHOW_NOTATION;
     opt.trust_model=TM_AUTO;
     opt.mangle_dos_filenames = 1;
+    opt.use_agent = 1;
 
 #if defined (__MINGW32__)
     set_homedir ( read_w32_registry_string( NULL,
@@ -1984,6 +1985,9 @@ main( int argc, char **argv )
     }
 #endif
 
+#warning locking does not work - disabled
+    disable_dotlock ();
+
     if (opt.verbose > 2)
         log_info ("using character set `%s'\n", get_native_charset ());