mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
gpg: Allow new user ids with only the mail address.
* g10/keygen.c (ask_user_id): Allow empty name. -- The --quick-gen-key command allows this and further some mail providers require that a key has only the mail address to allow for anonymous accounts. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
bb99b40bd1
commit
fc0c71dfe5
14
g10/keygen.c
14
g10/keygen.c
@ -2533,8 +2533,11 @@ ask_user_id (int mode, int full, KBNODE keyblock)
|
|||||||
}
|
}
|
||||||
else if( digitp(aname) )
|
else if( digitp(aname) )
|
||||||
tty_printf(_("Name may not start with a digit\n"));
|
tty_printf(_("Name may not start with a digit\n"));
|
||||||
else if( strlen(aname) < 5 )
|
else if (*aname && strlen (aname) < 5)
|
||||||
|
{
|
||||||
tty_printf(_("Name must be at least 5 characters long\n"));
|
tty_printf(_("Name must be at least 5 characters long\n"));
|
||||||
|
/* However, we allow an empty name. */
|
||||||
|
}
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -2577,11 +2580,20 @@ ask_user_id (int mode, int full, KBNODE keyblock)
|
|||||||
|
|
||||||
xfree(uid);
|
xfree(uid);
|
||||||
uid = p = xmalloc(strlen(aname)+strlen(amail)+strlen(acomment)+12+10);
|
uid = p = xmalloc(strlen(aname)+strlen(amail)+strlen(acomment)+12+10);
|
||||||
|
if (!*aname && *amail && !*acomment && !random_is_faked ())
|
||||||
|
{ /* Empty name and comment but with mail address. Use
|
||||||
|
simplified form with only the non-angle-bracketed mail
|
||||||
|
address. */
|
||||||
|
p = stpcpy (p, amail);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
p = stpcpy (p, aname );
|
p = stpcpy (p, aname );
|
||||||
if (*acomment)
|
if (*acomment)
|
||||||
p = stpcpy(stpcpy(stpcpy(p," ("), acomment),")");
|
p = stpcpy(stpcpy(stpcpy(p," ("), acomment),")");
|
||||||
if (*amail)
|
if (*amail)
|
||||||
p = stpcpy(stpcpy(stpcpy(p," <"), amail),">");
|
p = stpcpy(stpcpy(stpcpy(p," <"), amail),">");
|
||||||
|
}
|
||||||
|
|
||||||
/* Append a warning if the RNG is switched into fake mode. */
|
/* Append a warning if the RNG is switched into fake mode. */
|
||||||
if ( random_is_faked () )
|
if ( random_is_faked () )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user