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

g10: Let card-edit/key-attr show message when change.

Browse Source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-04-05 10:37:23 +09:00
parent 83529e1bd1
commit 870527df0d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
g10/card-util.c
View File

@ -1389,12 +1389,7 @@ ask_card_rsa_keysize (unsigned int nbits)
"RSA", min_nbits, max_nbits); "RSA", min_nbits, max_nbits);
} }
else else
{ return req_nbits;
tty_printf (_("The card will now be re-configured"
" to generate a key of %u bits\n"), req_nbits);
show_keysize_warning ();
return req_nbits;
}
} }
} }
@ -1501,8 +1496,19 @@ ask_card_keyattr (int keyno, const struct key_attr *current)
} }
leave: leave:
if (!key_attr) if (key_attr)
tty_printf (_("No change.")); {
if (key_attr->algo == PUBKEY_ALGO_RSA)
tty_printf (_("The card will now be re-configured"
" to generate a key of %u bits\n"), key_attr->nbits);
else if (key_attr->algo == PUBKEY_ALGO_ECDH
|| key_attr->algo == PUBKEY_ALGO_ECDSA
|| key_attr->algo == PUBKEY_ALGO_EDDSA)
tty_printf (_("The card will now be re-configured"
" to generate a key of type: %s\n"), key_attr->curve),
show_keysize_warning ();
}
return key_attr; return key_attr;
} }