security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* command.c (cmd_passwd): Take acount of a key description.

Browse source 
* genkey.c (reenter_compare_cb): Do not set the error text.
(agent_protect_and_store, agent_genkey): Force a re-enter after a
non-matching passphrase.
* query.c (agent_askpin): Add new arg INITIAL_ERRTEXT; changed
all callers.
This commit is contained in:
Werner Koch 2004-02-21 13:05:22 +00:00
parent ffd5cd0368
commit a425334f48
7 changed files with 59 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
agent/command.c
View file

@ -664,7 +664,8 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line)
return rc; /* we can't jump to leave because this is already an
Assuan error code. */
rc = agent_key_from_file (ctrl, NULL, grip, &shadow_info, 1, &s_skey);
rc = agent_key_from_file (ctrl, ctrl->server_local->keydesc,
grip, &shadow_info, 1, &s_skey);
if (rc)
;
else if (!s_skey)
@ -675,6 +676,8 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line)
else
rc = agent_protect_and_store (ctrl, s_skey);
xfree (ctrl->server_local->keydesc);
ctrl->server_local->keydesc = NULL;
gcry_sexp_release (s_skey);
xfree (shadow_info);
if (rc)