Skip to content

Commit 870527d

Browse files
author
NIIBE Yutaka
committed
g10: Let card-edit/key-attr show message when change.
* g10/card-util.c (ask_card_rsa_keysize): Don't show message here. (ask_card_keyattr): Show message when change, also for ECC. Signed-off-by: NIIBE Yutaka <[email protected]>
1 parent 83529e1 commit 870527d

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

g10/card-util.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,12 +1389,7 @@ ask_card_rsa_keysize (unsigned int nbits)
13891389
"RSA", min_nbits, max_nbits);
13901390
}
13911391
else
1392-
{
1393-
tty_printf (_("The card will now be re-configured"
1394-
" to generate a key of %u bits\n"), req_nbits);
1395-
show_keysize_warning ();
1396-
return req_nbits;
1397-
}
1392+
return req_nbits;
13981393
}
13991394
}
14001395

@@ -1501,8 +1496,19 @@ ask_card_keyattr (int keyno, const struct key_attr *current)
15011496
}
15021497

15031498
leave:
1504-
if (!key_attr)
1505-
tty_printf (_("No change."));
1499+
if (key_attr)
1500+
{
1501+
if (key_attr->algo == PUBKEY_ALGO_RSA)
1502+
tty_printf (_("The card will now be re-configured"
1503+
" to generate a key of %u bits\n"), key_attr->nbits);
1504+
else if (key_attr->algo == PUBKEY_ALGO_ECDH
1505+
|| key_attr->algo == PUBKEY_ALGO_ECDSA
1506+
|| key_attr->algo == PUBKEY_ALGO_EDDSA)
1507+
tty_printf (_("The card will now be re-configured"
1508+
" to generate a key of type: %s\n"), key_attr->curve),
1509+
1510+
show_keysize_warning ();
1511+
}
15061512

15071513
return key_attr;
15081514
}

0 commit comments

Comments
 (0)