diff options
| author | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-07-24 17:18:42 +0200 |
|---|---|---|
| committer | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-07-24 17:18:42 +0200 |
| commit | 872137b5921dd297e7d2c1def6e3868b7595feb5 (patch) | |
| tree | 53c0721072ffa237566240d57f510e0afa4e0331 /g10/call-agent.h | |
| parent | w32: Change directory on daemon startup. (diff) | |
| download | gnupg2-872137b5921dd297e7d2c1def6e3868b7595feb5.tar.xz gnupg2-872137b5921dd297e7d2c1def6e3868b7595feb5.zip | |
g10: Make sure to emit NEED_PASSPHRASE on --import of secret key.
* call-agent.h (agent_import_key): Add keyid parameters.
* call-agent.c (agent_import_key): Set keyid parameters.
* import.c (transfer_secret_keys): Pass keyid parameters.
Signed-off-by: Marcus Brinkmann <mb@g10code.com>
GnuPG-bug-id: 2667
Diffstat (limited to 'g10/call-agent.h')
| -rw-r--r-- | g10/call-agent.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h index dcabbe8ff..f45b64d90 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -186,7 +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, int force); + size_t keylen, int unattended, int force, + u32 *keyid, u32 *mainkeyid, int pubkey_algo); /* Receive a key from the agent. */ gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip, |