security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

* armor.c (parse_header_line): Improve test so that the header test

Browse Source 
only allows "Hash" in the signed data section.
This commit is contained in:
David Shaw 2007-07-19 12:29:22 +00:00
parent 2aa497521d
commit 14d6d2c90c
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-19 David Shaw <dshaw@jabberwocky.com>
* armor.c (parse_header_line): Improve test so that the header
test only allows "Hash" in the signed data section.
2007-07-18 David Shaw <dshaw@jabberwocky.com> 2007-07-18 David Shaw <dshaw@jabberwocky.com>
* armor.c (is_armor_tag): New. Detect if an armor header matches * armor.c (is_armor_tag): New. Detect if an armor header matches

36
g10/armor.c
View File

@ -436,28 +436,32 @@ parse_header_line( armor_filter_context_t *afx, byte *line, unsigned int len )
putc('\n', stderr); putc('\n', stderr);
} }
/* Section 6.2: OpenPGP should consider improperly formatted Armor if( afx->in_cleartext )
Headers to be corruption of the ASCII Armor. Unknown keys
should be reported to the user, but OpenPGP should continue to
process the message. */
if(!is_armor_tag(line))
{ {
if( (hashes=parse_hash_header( line )) )
afx->hashes |= hashes;
else if( strlen(line) > 15 && !memcmp( line, "NotDashEscaped:", 15 ) )
afx->not_dash_escaped = 1;
else
{
log_error(_("invalid clearsig header\n"));
return -1;
}
}
else if(!is_armor_tag(line))
{
/* Section 6.2: "Unknown keys should be reported to the user,
but OpenPGP should continue to process the message." Note
that in a clearsigned message this applies to the signature
part (i.e. "BEGIN PGP SIGNATURE") and not the signed data
("BEGIN PGP SIGNED MESSAGE"). The only key allowed in the
signed data section is "Hash". */
log_info(_("unknown armor header: ")); log_info(_("unknown armor header: "));
print_string( stderr, line, len, 0 ); print_string( stderr, line, len, 0 );
putc('\n', stderr); putc('\n', stderr);
} }
if( afx->in_cleartext ) {
if( (hashes=parse_hash_header( line )) )
afx->hashes |= hashes;
else if( strlen(line) > 15 && !memcmp( line, "NotDashEscaped:", 15 ) )
afx->not_dash_escaped = 1;
else {
log_error(_("invalid clearsig header\n"));
return -1;
}
}
return 1; return 1;
} }