security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog: Sun Feb 28 19:11:00 CET 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-02-28 18:14:18 +00:00
parent 694099b9af
commit 0f5bb383b5
8 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/keygen.c
View file

@ -555,17 +555,18 @@ static int
has_invalid_email_chars( const char *s )
{
int at_seen=0;
static char valid_chars[] = "01234567890_-."
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
for( ; *s; s++ ) {
if( *s & 0x80 )
return 1;
if( *s == '@' )
at_seen=1;
else if( !at_seen
&& !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.+", *s ))
else if( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )
return 1;
else if( at_seen
&& !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.", *s ) )
else if( at_seen && !strchr( valid_chars, *s ) )
return 1;
}
return 0;
@ -608,7 +609,6 @@ ask_user_id( int mode )
m_free(amail);
amail = cpr_get("keygen.email",_("Email address: "));
trim_spaces(amail);
strlwr(amail);
cpr_kill_prompt();
if( !*amail )
break; /* no email address is okay */