security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-24 15:17:02 +01:00
Code Activity

gpg: Rename two card related functions in card-util.

Browse Source 
* 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>
(cherry picked from commit f795f4529d8ab5a05db1cc1960abd34390bfae1b)
This commit is contained in:
Werner Koch 2017-10-27 14:44:53 +02:00
parent 3da47d19df
commit de3a740c2e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/card-util.c
View File

@ -1328,7 +1328,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;
@ -1378,7 +1378,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];
@ -1459,8 +1459,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);
@ -1542,8 +1542,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);