security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

(add_notation_data): Check number of at-signs.

Browse Source
This commit is contained in:
Werner Koch 2005-05-24 09:14:31 +00:00
parent 2f63b5299c
commit d8bd3a3826
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-24 Werner Koch <wk@g10code.com>
* g10.c (add_notation_data): Check number of at-signs.
2005-05-23 Werner Koch <wk@g10code.com> 2005-05-23 Werner Koch <wk@g10code.com>
* app-openpgp.c, app-common.h: Again updated from gnupg 1.9 CVS. * app-openpgp.c, app-common.h: Again updated from gnupg 1.9 CVS.

8
g10/g10.c
View File

@ -3879,7 +3879,7 @@ add_notation_data( const char *string, int which )
for( s=string ; *s != '='; s++ ) for( s=string ; *s != '='; s++ )
{ {
if( *s=='@') if( *s=='@')
saw_at=1; saw_at++;
if( !*s || !isascii (*s) || (!isgraph(*s) && !isspace(*s)) ) if( !*s || !isascii (*s) || (!isgraph(*s) && !isspace(*s)) )
{ {
@ -3894,6 +3894,12 @@ add_notation_data( const char *string, int which )
log_error(_("a user notation name must contain the '@' character\n")); log_error(_("a user notation name must contain the '@' character\n"));
return; return;
} }
if (saw_at > 1)
{
log_error(_("a notation name must contain more than "
"one '@' character\n"));
return;
}
/* we only support printable text - therefore we enforce the use /* we only support printable text - therefore we enforce the use
* of only printable characters (an empty value is valid) */ * of only printable characters (an empty value is valid) */