diff options
| author | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
| commit | bfbd80feb95fba36292cd9dab43016f17b1e6972 (patch) | |
| tree | 9afbfd29e8aeb78fa34a1a49d8b8071554d4f593 /agent/pkdecrypt.c | |
| parent | * options.skel: Make the example for force-v3-sigs match reality (it (diff) | |
| download | gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.tar.gz gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.zip | |
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes.
Doc updates.
Diffstat (limited to 'agent/pkdecrypt.c')
| -rw-r--r-- | agent/pkdecrypt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index 11d297fbf..11d0cc375 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -66,7 +66,9 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text, } rc = agent_key_from_file (ctrl, NULL, desc_text, ctrl->keygrip, &shadow_info, - CACHE_MODE_NORMAL, NULL, &s_skey); + CACHE_MODE_NORMAL, NULL, &s_skey, NULL); + if (gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED) + rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED); if (rc) { if (gpg_err_code (rc) == GPG_ERR_ENOENT) |