diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2015-12-24 06:15:58 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2015-12-24 06:15:58 +0100 |
| commit | 5ca57f1a697e875bae5a5c73f1a580c42ca75343 (patch) | |
| tree | 2640f8cfb96b8f500d0eae7438c03ffcb0f05178 /g10/call-agent.h | |
| parent | g10: Remove subcommand checkbkupkey for --key-edit. (diff) | |
| download | gnupg2-5ca57f1a697e875bae5a5c73f1a580c42ca75343.tar.xz gnupg2-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 'g10/call-agent.h')
| -rw-r--r-- | g10/call-agent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h index fa1b88a29..208b75b2d 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -186,8 +186,8 @@ gpg_error_t agent_keywrap_key (ctrl_t ctrl, int forexport, /* Send a key to the agent. */ gpg_error_t agent_import_key (ctrl_t ctrl, const char *desc, - char **cache_nonce_addr, - const void *key, size_t keylen, int unattended); + char **cache_nonce_addr, const void *key, + size_t keylen, int unattended, int force); /* Receive a key from the agent. */ gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip, |