aboutsummaryrefslogtreecommitdiffstats
path: root/agent/agent.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-07-08 12:20:01 +0000
committerWerner Koch <[email protected]>2020-07-08 12:20:01 +0000
commiteace4bbe1ded8b01f9ad52ebc1871f2fd13c3a08 (patch)
treee4877d2ff6e5b18bffa088539a261a8de91d4563 /agent/agent.h
parentgpg: Fix flaw in symmetric algorithm selection in mixed mode. (diff)
downloadgnupg-eace4bbe1ded8b01f9ad52ebc1871f2fd13c3a08.tar.gz
gnupg-eace4bbe1ded8b01f9ad52ebc1871f2fd13c3a08.zip
agent: New option --newsymkey for GET_PASSPHRASE
* agent/call-pinentry.c (agent_get_passphrase): Add arg pininfo. * agent/genkey.c (check_passphrase_constraints): New arg no_empty. * agent/command.c (reenter_passphrase_cmp_cb): New. (cmd_get_passphrase): Add option --newsymkey. -- This new option allows to present a passphrase with the usual repeat box as it is used by gpg-agent's internal key generation. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/agent.h')
-rw-r--r--agent/agent.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/agent/agent.h b/agent/agent.h
index 9c84f6a17..7ef0ffca7 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -478,7 +478,8 @@ gpg_error_t agent_askpin (ctrl_t ctrl,
int agent_get_passphrase (ctrl_t ctrl, char **retpass,
const char *desc, const char *prompt,
const char *errtext, int with_qualitybar,
- const char *keyinfo, cache_mode_t cache_mode);
+ const char *keyinfo, cache_mode_t cache_mode,
+ struct pin_entry_info_s *pininfo);
int agent_get_confirmation (ctrl_t ctrl, const char *desc, const char *ok,
const char *notokay, int with_cancel);
int agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn);
@@ -515,7 +516,7 @@ int agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
membuf_t *outbuf, int *r_padding);
/*-- genkey.c --*/
-int check_passphrase_constraints (ctrl_t ctrl, const char *pw,
+int check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
char **failed_constraint);
gpg_error_t agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
char **r_passphrase);