mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* import.c (import_secret_one): Check for an illegal (>110) protection
cipher when importing a secret key. * keylist.c (list_keyblock_print): Show a '#' for a secret-parts-missing key. * parse_packet.c (parse_key): Some comments. * revoke.c (gen_revoke): Remove some debugging code. * trustdb.c (verify_own_keys): Make trusted-key a non-deprecated option again.
This commit is contained in:
parent
b8e23f7cb2
commit
27d526298b
6 changed files with 37 additions and 14 deletions
|
@ -839,6 +839,13 @@ import_secret_one( const char *fname, KBNODE keyblock,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if(sk->protect.algo>110)
|
||||
{
|
||||
log_error(_("key %08lX: secret key with invalid cipher %d "
|
||||
"- skipped\n"),(ulong)keyid[1],sk->protect.algo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
clear_kbnode_flags( keyblock );
|
||||
|
||||
/* do we have this key already in one of our secrings ? */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue