mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* getkey.c (merge_selfsigs_subkey): Do not mark subkeys valid if we do not
support their pk algorithm. This allows for early (during get_*) rejection of a subkey, and selection of another. * passphrase.c (passphrase_to_dek): Give a little more information when we have room to do so.
This commit is contained in:
parent
1e01514529
commit
ea73c94bc6
3 changed files with 19 additions and 5 deletions
|
@ -1134,7 +1134,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
|
|||
if(keystrlen()>10)
|
||||
{
|
||||
tty_printf("\n");
|
||||
tty_printf(_(" (main key ID %s)"),
|
||||
tty_printf(_(" (subkey on main key ID %s)"),
|
||||
keystr(&keyid[2]) );
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue