aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/keygen.c')
-rw-r--r--g10/keygen.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 6c27cec90..fb93363e8 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1655,13 +1655,8 @@ ask_user_id( int mode )
cpr_kill_prompt();
if( !*amail || opt.allow_freeform_uid )
break; /* no email address is okay */
- else if( has_invalid_email_chars(amail)
- || string_count_chr(amail,'@') != 1
- || *amail == '@'
- || amail[strlen(amail)-1] == '@'
- || amail[strlen(amail)-1] == '.'
- || strstr(amail, "..") )
- tty_printf(_("Not a valid email address\n"));
+ else if ( !is_valid_mailbox (amail) )
+ tty_printf(_("Not a valid email address\n"));
else
break;
}