security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* query.c (agent_askpin): Provide the default desc text depending

Browse Source 
on the pininfo.  Do the basic PIN verification only when
min_digist is set.
This commit is contained in:
Werner Koch 2002-08-22 09:47:39 +00:00
parent b8a7c191de
commit 26f4dbc64b
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/ChangeLog
View File

@ -1,3 +1,9 @@
2002-08-22 Werner Koch <wk@gnupg.org>
* query.c (agent_askpin): Provide the default desc text depending
on the pininfo. Do the basic PIN verification only when
min_digist is set.
2002-08-21 Werner Koch <wk@gnupg.org> 2002-08-21 Werner Koch <wk@gnupg.org>
* query.c (agent_askpin): Hack to show the right default prompt. * query.c (agent_askpin): Hack to show the right default prompt.

2
agent/gpg-agent.c
View File

@ -732,7 +732,7 @@ handle_signal (int signo)
cleanup (); cleanup ();
agent_exit (0); agent_exit (0);
} }
break; break;
case SIGINT: case SIGINT:
log_info ("SIGINT received - immediate shutdown\n"); log_info ("SIGINT received - immediate shutdown\n");

11
agent/query.c
View File

@ -236,15 +236,18 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct entry_parm_s parm; struct entry_parm_s parm;
const char *errtext = NULL; const char *errtext = NULL;
int is_pin; int is_pin = 0;
if (opt.batch) if (opt.batch)
return 0; /* fixme: we should return BAD PIN */ return 0; /* fixme: we should return BAD PIN */
if (!pininfo || pininfo->max_length < 1) if (!pininfo || pininfo->max_length < 1)
return seterr (Invalid_Value); return seterr (Invalid_Value);
if (!desc_text) if (!desc_text && pininfo->min_digits)
desc_text = _("Please enter you PIN, so that the secret key " desc_text = _("Please enter your PIN, so that the secret key "
"can be unlocked for this session");
else if (!desc_text)
desc_text = _("Please enter your passphrase, so that the secret key "
"can be unlocked for this session"); "can be unlocked for this session");
is_pin = desc_text && strstr (desc_text, "PIN"); is_pin = desc_text && strstr (desc_text, "PIN");
@ -292,7 +295,7 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
else if (rc) else if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
if (!errtext && is_pin) if (!errtext && pininfo->min_digits)
{ {
/* do some basic checks on the entered PIN. */ /* do some basic checks on the entered PIN. */
if (!all_digitsp (pininfo->pin)) if (!all_digitsp (pininfo->pin))