aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-04-12 06:56:21 +0000
committerNIIBE Yutaka <[email protected]>2022-04-12 06:56:34 +0000
commite561cb1ae0f31429cb5eac9e6213883576e1ae51 (patch)
treeaf93a1b6a55ebafd8bf39f6757da549326603fca
parentAdd v5 signature salt. (diff)
downloadgnupg-e561cb1ae0f31429cb5eac9e6213883576e1ae51.tar.gz
gnupg-e561cb1ae0f31429cb5eac9e6213883576e1ae51.zip
Allow no uidnode for v5 key.
Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--g10/import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/import.c b/g10/import.c
index 674f6437b..d9e4787a6 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1934,7 +1934,7 @@ import_one_real (ctrl_t ctrl,
}
- if (!uidnode)
+ if (pk->version < 5 && !uidnode)
{
if (!silent)
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. */
- if (!delete_inv_parts (ctrl, keyblock, keyid, options))
+ if (!delete_inv_parts (ctrl, keyblock, keyid, options) && pk->version < 5)
{
if (!silent)
{