mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Allow no uidnode for v5 key.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
4d8decc23c
commit
e561cb1ae0
@ -1934,7 +1934,7 @@ import_one_real (ctrl_t ctrl,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!uidnode)
|
if (pk->version < 5 && !uidnode)
|
||||||
{
|
{
|
||||||
if (!silent)
|
if (!silent)
|
||||||
log_error( _("key %s: no user ID\n"), keystr_from_pk(pk));
|
log_error( _("key %s: no user ID\n"), keystr_from_pk(pk));
|
||||||
@ -2021,7 +2021,7 @@ import_one_real (ctrl_t ctrl,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Delete invalid parts and bail out if there are no user ids left. */
|
/* Delete invalid parts and bail out if there are no user ids left. */
|
||||||
if (!delete_inv_parts (ctrl, keyblock, keyid, options))
|
if (!delete_inv_parts (ctrl, keyblock, keyid, options) && pk->version < 5)
|
||||||
{
|
{
|
||||||
if (!silent)
|
if (!silent)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user