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/command.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 '')
| -rw-r--r-- | agent/command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/command.c b/agent/command.c index a3e1c514a..0406ea439 100644 --- a/agent/command.c +++ b/agent/command.c @@ -606,9 +606,9 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line) return rc; /* we can't jump to leave because this is already an Assuan error code. */ - s_skey = agent_key_from_file (ctrl, grip, &shadow_info, 1); - if (!s_skey && !shadow_info) - rc = gpg_error (GPG_ERR_NO_SECKEY); + rc = agent_key_from_file (ctrl, grip, &shadow_info, 1, &s_skey); + if (rc) + ; else if (!s_skey) { log_error ("changing a smartcard PIN is not yet supported\n"); |