security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

scd:nks: Fix remaining tries warning in --reset mode.

Browse Source 
* scd/app-nks.c (do_change_pin): Chnage computaion of 'remaining'.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-06-25 11:25:58 +02:00
parent 28c069db3b
commit 2429e85598
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scd/app-nks.c
View File

@ -1758,15 +1758,6 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *pwidstr,
if (err) if (err)
return err; return err;
remaining = iso7816_verify_status (app_get_slot (app), pwid);
if (remaining < 0)
remaining = -1; /* We don't care about the concrete error. */
if (remaining < 3)
{
if (remaining >= 0)
log_info ("nks: PIN has %d attempts left\n", remaining);
}
if ((flags & APP_CHANGE_FLAG_NULLPIN)) if ((flags & APP_CHANGE_FLAG_NULLPIN))
{ {
/* With the nullpin flag, we do not verify the PIN - it would /* With the nullpin flag, we do not verify the PIN - it would
@ -1811,11 +1802,21 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *pwidstr,
goto leave; goto leave;
} }
desc = parse_pwidstr (app, altpwidstr, 0, &dummy1, &dummy2); desc = parse_pwidstr (app, altpwidstr, 0, &dummy1, &dummy2);
remaining = iso7816_verify_status (app_get_slot (app), dummy2);
} }
else else
{ {
/* Regular change mode: Ask for the old PIN. */ /* Regular change mode: Ask for the old PIN. */
desc = parse_pwidstr (app, pwidstr, 0, &dummy1, &dummy2); desc = parse_pwidstr (app, pwidstr, 0, &dummy1, &dummy2);
remaining = iso7816_verify_status (app_get_slot (app), pwid);
}
if (remaining < 0)
remaining = -1; /* We don't care about the concrete error. */
if (remaining < 3)
{
if (remaining >= 0)
log_info ("nks: PIN has %d attempts left\n", remaining);
} }
prompt = make_prompt (app, remaining, desc, NULL); prompt = make_prompt (app, remaining, desc, NULL);