security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-06 23:17:47 +02:00
Code Activity

card: Netkey improvement for passwd.

Browse Source 
* tools/gpg-card.c (cmd_passwd) [Netkey]: No Standard/QES menu if the
card does not support it.  Print no error in cases the user canceled.
This commit is contained in:
Werner Koch 2020-11-27 09:59:19 +01:00
parent bb591222c3
commit 5804db1a13
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/gpg-card.c
View File

@ -2733,24 +2733,30 @@ cmd_passwd (card_info_t info, char *argstr)
menu_used = 1; menu_used = 1;
for (;;) log_assert (DIM (info->chvinfo) >= 4);
/* If there is a qualified signature use a a menu to select
* between standard PIN and QES PINs. */
if (info->chvinfo[2] != -2 || info->chvinfo[3] != -2)
{ {
xfree (answer); for (;;)
answer = get_selection (" 1 - Standard PIN/PUK\n"
" 2 - PIN/PUK for qualified signature\n"
" Q - quit\n");
if (!ascii_strcasecmp (answer, "q"))
goto leave;
else if (!strcmp (answer, "1"))
break;
else if (!strcmp (answer, "2"))
{ {
for_qualified = 1; xfree (answer);
break; answer = get_selection (" 1 - Standard PIN/PUK\n"
" 2 - PIN/PUK for qualified signature\n"
" Q - quit\n");
if (!ascii_strcasecmp (answer, "q"))
goto leave;
else if (!strcmp (answer, "1"))
break;
else if (!strcmp (answer, "2"))
{
for_qualified = 1;
break;
}
} }
} }
log_assert (DIM (info->chvinfo) >= 4);
if (info->chvinfo[for_qualified? 2 : 0] == -4) if (info->chvinfo[for_qualified? 2 : 0] == -4)
{ {
while (!pinref) while (!pinref)
@ -2817,6 +2823,9 @@ cmd_passwd (card_info_t info, char *argstr)
{ {
if (!opt.interactive && !menu_used && !opt.verbose) if (!opt.interactive && !menu_used && !opt.verbose)
; ;
else if (gpg_err_code (err) == GPG_ERR_CANCELED
&& gpg_err_source (err) == GPG_ERR_SOURCE_PINENTRY)
log_info ("%s\n", gpg_strerror (err));
else if (!ascii_strcasecmp (pinref, "PIV.81")) else if (!ascii_strcasecmp (pinref, "PIV.81"))
log_error ("Error changing the PUK.\n"); log_error ("Error changing the PUK.\n");
else if (!ascii_strcasecmp (pinref, "OPENPGP.1") && reset_mode) else if (!ascii_strcasecmp (pinref, "OPENPGP.1") && reset_mode)