diff options
| author | Werner Koch <[email protected]> | 2013-10-04 06:20:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-10-04 12:05:59 +0000 |
| commit | e6175055fbca958b7fa43aaf84359574ca7f3ebb (patch) | |
| tree | 332a905606ed1aadfd080cb9f42c9fcf1438b68f /common/t-openpgp-oid.c | |
| parent | gpg: Fix bug with deeply nested compressed packets. (diff) | |
| download | gnupg-e6175055fbca958b7fa43aaf84359574ca7f3ebb.tar.gz gnupg-e6175055fbca958b7fa43aaf84359574ca7f3ebb.zip | |
gpg: Limit the nesting level of I/O filters.
* common/iobuf.c (MAX_NESTING_FILTER): New.
(iobuf_push_filter2): Limit the nesting level.
* g10/mainproc.c (mainproc_context): New field ANY. Change HAVE_DATA
and ANY_SIG_SIGN to bit fields of ANY. Add bit field
UNCOMPRESS_FAILED.
(proc_compressed): Avoid printing multiple Bad Data messages.
(check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
--
This is a more general fix for the nested compression packet bug. In
particular this helps g10/import.c:read_block to stop pushing
compression filters onto an iobuf stream. This patch also reduces the
number of error messages for the non-import case.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 35e40e2d514223c950c2f6d1214e02e92d87e997)
Resolved conflicts:
common/iobuf.c
g10/mainproc.c
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions