mirror of
git://git.gnupg.org/gnupg.git
synced 2025-06-13 18:21:03 +02:00
gpg: Rename two card related functions in card-util.
* g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr. (do_change_rsa_keysize): Rename to do_change_keyattr. -- We want to support other algos than RSA and thus we need a better name for the functions. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
6c63a04569
commit
f795f4529d
@ -1330,7 +1330,7 @@ show_keysize_warning (void)
|
|||||||
select the prompt. Returns 0 to use the default size (i.e. NBITS)
|
select the prompt. Returns 0 to use the default size (i.e. NBITS)
|
||||||
or the selected size. */
|
or the selected size. */
|
||||||
static unsigned int
|
static unsigned int
|
||||||
ask_card_rsa_keysize (int keyno, unsigned int nbits)
|
ask_card_keyattr (int keyno, unsigned int nbits)
|
||||||
{
|
{
|
||||||
unsigned int min_nbits = 1024;
|
unsigned int min_nbits = 1024;
|
||||||
unsigned int max_nbits = 4096;
|
unsigned int max_nbits = 4096;
|
||||||
@ -1380,7 +1380,7 @@ ask_card_rsa_keysize (int keyno, unsigned int nbits)
|
|||||||
/* Change the size of key KEYNO (0..2) to NBITS and show an error
|
/* Change the size of key KEYNO (0..2) to NBITS and show an error
|
||||||
message if that fails. */
|
message if that fails. */
|
||||||
static gpg_error_t
|
static gpg_error_t
|
||||||
do_change_rsa_keysize (int keyno, unsigned int nbits)
|
do_change_keyattr (int keyno, unsigned int nbits)
|
||||||
{
|
{
|
||||||
gpg_error_t err;
|
gpg_error_t err;
|
||||||
char args[100];
|
char args[100];
|
||||||
@ -1461,8 +1461,8 @@ generate_card_keys (ctrl_t ctrl)
|
|||||||
{
|
{
|
||||||
if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
|
if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
|
||||||
{
|
{
|
||||||
nbits = ask_card_rsa_keysize (keyno, info.key_attr[keyno].nbits);
|
nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
|
||||||
if (nbits && do_change_rsa_keysize (keyno, nbits))
|
if (nbits && do_change_keyattr (keyno, nbits))
|
||||||
{
|
{
|
||||||
/* Error: Better read the default key size again. */
|
/* Error: Better read the default key size again. */
|
||||||
agent_release_card_info (&info);
|
agent_release_card_info (&info);
|
||||||
@ -1544,8 +1544,8 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
|
|||||||
unsigned int nbits;
|
unsigned int nbits;
|
||||||
|
|
||||||
ask_again:
|
ask_again:
|
||||||
nbits = ask_card_rsa_keysize (keyno-1, info.key_attr[keyno-1].nbits);
|
nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
|
||||||
if (nbits && do_change_rsa_keysize (keyno-1, nbits))
|
if (nbits && do_change_keyattr (keyno-1, nbits))
|
||||||
{
|
{
|
||||||
/* Error: Better read the default key size again. */
|
/* Error: Better read the default key size again. */
|
||||||
agent_release_card_info (&info);
|
agent_release_card_info (&info);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user