diff options
| author | NIIBE Yutaka <[email protected]> | 2015-12-24 05:19:53 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-12-24 05:19:53 +0000 |
| commit | 79b51bb8727bd3485229ac8ff5987558156d5d83 (patch) | |
| tree | 4ff9623fdcaa0da34a24323689bbd5819750a687 /agent/cvt-openpgp.h | |
| parent | g10: Use --force when importing key for bkuptocard. (diff) | |
| download | gnupg-79b51bb8727bd3485229ac8ff5987558156d5d83.tar.gz gnupg-79b51bb8727bd3485229ac8ff5987558156d5d83.zip | |
agent: IMPORT_KEY with --force option fix.
* agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
to check existing key.
(convert_from_openpgp): Ditto.
(convert_from_openpgp_native): Call convert_from_openpgp_main with
dontcare_exist=0.
* agent/command.c (cmd_import_key): Call with dontcare_exist=force.
Diffstat (limited to 'agent/cvt-openpgp.h')
| -rw-r--r-- | agent/cvt-openpgp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/agent/cvt-openpgp.h b/agent/cvt-openpgp.h index d27a776ef..9a4fc3dbf 100644 --- a/agent/cvt-openpgp.h +++ b/agent/cvt-openpgp.h @@ -20,6 +20,7 @@ #define GNUPG_AGENT_CVT_OPENPGP_H gpg_error_t convert_from_openpgp (ctrl_t ctrl, gcry_sexp_t s_pgp, + int dontcare_exist, unsigned char *grip, const char *prompt, const char *cache_nonce, unsigned char **r_key, char **r_passphrase); |