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

* main.h, g10.c (main), card-util.c (change_pin): If "admin" has not been

Browse source 
issued, skip right to the CHV1/CHV2 PIN change.  No need to show the
unblock or admin PIN change option. (card_edit): Add "admin" command to
add admin commands to the menu.  Do not allow admin commands until "admin"
is given.

* app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin
PINs can be entered before the card is locked.

* options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove
--allow-admin.
This commit is contained in:
David Shaw 2004-09-25 13:04:55 +00:00
parent 4d26ab92cc
commit 2ff6607f0d
6 changed files with 143 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

28
g10/app-openpgp.c
View file

@ -667,18 +667,30 @@ verify_chv3 (APP app,
int (*pincb)(void*, const char *, char **),
void *pincb_arg)
{
int rc = 0;
int rc=0;
if (!opt.allow_admin)
{
log_info ("access to admin commands is not configured\n");
return gpg_error (GPG_ERR_EACCES);
}
if (!app->did_chv3)
{
struct agent_card_info_s info;
char *pinvalue;
memset(&info,0,sizeof(info));
rc=agent_scd_getattr("CHV-STATUS",&info);
if(rc)
log_error("error retrieving CHV status from card: %s\n",
gpg_strerror(rc));
else
{
if(info.chvretry[2]==0)
{
log_info("card is locked!\n");
return gpg_error (GPG_ERR_BAD_PIN);
}
else
log_info("%d Admin PIN attempts remaining before card"
" is permanently locked\n",info.chvretry[2]);
}
rc = pincb (pincb_arg, "Admin PIN", &pinvalue);
if (rc)
{
@ -688,7 +700,7 @@ verify_chv3 (APP app,
if (strlen (pinvalue) < 6)
{
log_error ("prassphrase (CHV3) is too short; minimum length is 6\n");
log_error ("passphrase (CHV3) is too short; minimum length is 6\n");
xfree (pinvalue);
return gpg_error (GPG_ERR_BAD_PIN);
}