diff options
| author | Werner Koch <[email protected]> | 2004-01-16 17:39:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-01-16 17:39:58 +0000 |
| commit | 671f696e55256b7a1788ef379a10edf273baa98b (patch) | |
| tree | a83eabbfac25dfb23369343266c0d69562c3253d /agent/pkdecrypt.c | |
| parent | Use GPG_ERROR_CFLAGS (diff) | |
| download | gnupg-671f696e55256b7a1788ef379a10edf273baa98b.tar.gz gnupg-671f696e55256b7a1788ef379a10edf273baa98b.zip | |
* findkey.c (agent_key_from_file): Now return an error code so
that we have more detailed error messages in the upper layers.
This fixes the handling pinentry's cancel button.
* pksign.c (agent_pksign): Changed accordingly.
* pkdecrypt.c (agent_pkdecrypt): Ditto.
* command.c (cmd_passwd): Ditto.
Diffstat (limited to 'agent/pkdecrypt.c')
| -rw-r--r-- | agent/pkdecrypt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index d17c688a0..cc3a2f33f 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -64,11 +64,10 @@ agent_pkdecrypt (CTRL ctrl, const char *ciphertext, size_t ciphertextlen, log_printhex ("keygrip:", ctrl->keygrip, 20); log_printhex ("cipher: ", ciphertext, ciphertextlen); } - s_skey = agent_key_from_file (ctrl, ctrl->keygrip, &shadow_info, 0); - if (!s_skey && !shadow_info) + rc = agent_key_from_file (ctrl, ctrl->keygrip, &shadow_info, 0, &s_skey); + if (rc) { log_error ("failed to read the secret key\n"); - rc = gpg_error (GPG_ERR_NO_SECKEY); goto leave; } |