diff options
| author | NIIBE Yutaka <[email protected]> | 2015-12-24 05:15:58 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-12-24 05:15:58 +0000 |
| commit | 5ca57f1a697e875bae5a5c73f1a580c42ca75343 (patch) | |
| tree | 2640f8cfb96b8f500d0eae7438c03ffcb0f05178 /g10/import.c | |
| parent | g10: Remove subcommand checkbkupkey for --key-edit. (diff) | |
| download | gnupg-5ca57f1a697e875bae5a5c73f1a580c42ca75343.tar.gz gnupg-5ca57f1a697e875bae5a5c73f1a580c42ca75343.zip | |
g10: Use --force when importing key for bkuptocard.
* g10/call-agent.c (agent_import_key): Add an argument FORCE.
* g10/import.c (transfer_secret_keys): Likewise.
(import_secret_one): Call transfer_secret_keys with FORCE=0.
* g10/keyedit.c (keyedit_menu): Call with FORCE=1.
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index 27bfece34..d35b5d590 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1319,8 +1319,8 @@ import_one (ctrl_t ctrl, true the secret keys are stored by gpg-agent in the transfer format (i.e. no re-protection and aksing for passphrases). */ gpg_error_t -transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, kbnode_t sec_keyblock, - int batch) +transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, + kbnode_t sec_keyblock, int batch, int force) { gpg_error_t err = 0; void *kek = NULL; @@ -1556,7 +1556,7 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, kbnode_t sec_ke { char *desc = gpg_format_keydesc (pk, FORMAT_KEYDESC_IMPORT, 1); err = agent_import_key (ctrl, desc, &cache_nonce, - wrappedkey, wrappedkeylen, batch); + wrappedkey, wrappedkeylen, batch, force); xfree (desc); } if (!err) @@ -1783,7 +1783,7 @@ import_secret_one (ctrl_t ctrl, const char *fname, kbnode_t keyblock, gpg_error_t err; nr_prev = stats->secret_imported; - err = transfer_secret_keys (ctrl, stats, keyblock, batch); + err = transfer_secret_keys (ctrl, stats, keyblock, batch, 0); if (gpg_err_code (err) == GPG_ERR_NOT_PROCESSED) { /* TRANSLATORS: For smartcard, each private key on |