diff options
| author | NIIBE Yutaka <[email protected]> | 2015-10-09 02:33:13 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-10-09 02:33:13 +0000 |
| commit | f70f6695368444d8058305ab696e5e5a1bace18c (patch) | |
| tree | d1797577da4a8b2702dafe1d68b2a4787764c134 /agent/agent.h | |
| parent | dirmngr: Default to http protocol for http-proxy (diff) | |
| download | gnupg-f70f6695368444d8058305ab696e5e5a1bace18c.tar.gz gnupg-f70f6695368444d8058305ab696e5e5a1bace18c.zip | |
agent: Fix function return type for check_cb and agent_askpin.
* agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
(start_pinentry, setup_qualitybar): Likewise.
(agent_askpin): Fix return value check of check_cb.
* agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
(ssh_identity_register): Fix return value check of agent_askpin.
* agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
* agent/findkey.c (try_unprotect_cb): Likewise.
* agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
(agent_ask_new_passphrase): Fix return value check of agent_askpin.
Diffstat (limited to 'agent/agent.h')
| -rw-r--r-- | agent/agent.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/agent/agent.h b/agent/agent.h index b3e84708c..6e24df4b4 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -257,7 +257,8 @@ struct pin_entry_info_s int with_qualitybar; /* Set if the quality bar should be displayed. */ int with_repeat; /* Request repetition of the passphrase. */ int repeat_okay; /* Repetition worked. */ - int (*check_cb)(struct pin_entry_info_s *); /* CB used to check the PIN */ + gpg_error_t (*check_cb)(struct pin_entry_info_s *); /* CB used to check + the PIN */ void *check_cb_arg; /* optional argument which might be of use in the CB */ const char *cb_errtext; /* used by the cb to display a specific error */ size_t max_length; /* Allocated length of the buffer PIN. */ @@ -402,11 +403,11 @@ void initialize_module_call_pinentry (void); void agent_query_dump_state (void); void agent_reset_query (ctrl_t ctrl); int pinentry_active_p (ctrl_t ctrl, int waitseconds); -int agent_askpin (ctrl_t ctrl, - const char *desc_text, const char *prompt_text, - const char *inital_errtext, - struct pin_entry_info_s *pininfo, - const char *keyinfo, cache_mode_t cache_mode); +gpg_error_t agent_askpin (ctrl_t ctrl, + const char *desc_text, const char *prompt_text, + const char *inital_errtext, + struct pin_entry_info_s *pininfo, + const char *keyinfo, cache_mode_t cache_mode); int agent_get_passphrase (ctrl_t ctrl, char **retpass, const char *desc, const char *prompt, const char *errtext, int with_qualitybar, |