From f8c993fbe28bf02f1d7aadec823a9dfc935398fa Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 2 Nov 2014 17:51:30 +0100 Subject: gpg: Avoid extra pinentries for each subkey in --export-secret-keys. * agent/command.c (cmd_export_key): Actually implement the cache_nonce feature. * g10/export.c (do_export_stream): Make use of a cache_nonce. Signed-off-by: Werner Koch --- g10/export.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'g10/export.c') diff --git a/g10/export.c b/g10/export.c index b4f1a2e4d..a92eace12 100644 --- a/g10/export.c +++ b/g10/export.c @@ -777,6 +777,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, strlist_t sl; int indent = 0; gcry_cipher_hd_t cipherhd = NULL; + char *cache_nonce = NULL; *any = 0; init_packet (&pkt); @@ -914,6 +915,8 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, clean_key (keyblock, opt.verbose, (options&EXPORT_MINIMAL), NULL, NULL); /* And write it. */ + xfree (cache_nonce); + cache_nonce = NULL; for (kbctx=NULL; (node = walk_kbnode (keyblock, &kbctx, 0)); ) { if (skip_until_subkey) @@ -1124,7 +1127,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, { char *prompt = gpg_format_keydesc (pk, FORMAT_KEYDESC_EXPORT,1); - err = agent_export_key (ctrl, hexgrip, prompt, NULL, + err = agent_export_key (ctrl, hexgrip, prompt, &cache_nonce, &wrappedkey, &wrappedkeylen); xfree (prompt); } @@ -1246,6 +1249,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, keydb_release (kdbhd); if (err || !keyblock_out) release_kbnode( keyblock ); + xfree (cache_nonce); if( !*any ) log_info(_("WARNING: nothing exported\n")); return err; -- cgit