diff options
| author | Neal H. Walfield <[email protected]> | 2015-08-21 09:55:15 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-08-21 12:21:13 +0000 |
| commit | 09f2a7bca624d0492e1d7ab29ce19542249c13ff (patch) | |
| tree | 16d9f1d0ab6635f21ef8fa13b701e38a48a7cdff /tests | |
| parent | common: Don't assume on-disk layout matches in-memory layout. (diff) | |
| download | gnupg-09f2a7bca624d0492e1d7ab29ce19542249c13ff.tar.gz gnupg-09f2a7bca624d0492e1d7ab29ce19542249c13ff.zip | |
common: Don't incorrectly reject 4 GB - 1 sized packets.
* g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
Add the constraint that the type must be 63.
* kbx/keybox-openpgp.c (next_packet): Likewise.
* tests/openpgp/4gb-packet.asc: New file.
* tests/openpgp/4gb-packet.test: New file.
* tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
(TEST_FILES): Add 4gb-packet.asc.
--
Signed-off-by: Neal H. Walfield <[email protected]>.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/4gb-packet.asc | bin | 0 -> 4983 bytes | |||
| -rwxr-xr-x | tests/openpgp/4gb-packet.test | 16 | ||||
| -rw-r--r-- | tests/openpgp/Makefile.am | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/tests/openpgp/4gb-packet.asc b/tests/openpgp/4gb-packet.asc Binary files differnew file mode 100644 index 000000000..7e5d6f349 --- /dev/null +++ b/tests/openpgp/4gb-packet.asc diff --git a/tests/openpgp/4gb-packet.test b/tests/openpgp/4gb-packet.test new file mode 100755 index 000000000..f8e43c80b --- /dev/null +++ b/tests/openpgp/4gb-packet.test @@ -0,0 +1,16 @@ +#!/bin/sh + +. $srcdir/defs.inc || exit 3 + +# GnuPG through 2.1.7 would incorrect mark packets whose size is +# 2^32-1 as invalid and exit with status code 2. +i=$srcdir/4gb-packet.asc + +if ! $GPG --list-packets $i +then + echo Failed to parse 4GB packet. + exit 1 +else + echo Can parse 4GB packets. + exit 0 +fi diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index dae8c1141..4fdb0a607 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -38,7 +38,7 @@ TESTS = version.test mds.test \ armdetachm.test detachm.test genkey1024.test \ conventional.test conventional-mdc.test \ multisig.test verify.test armor.test \ - import.test ecc.test finish.test + import.test ecc.test 4gb-packet.test finish.test TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ @@ -46,7 +46,7 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \ gpg.conf.tmpl gpg-agent.conf.tmpl \ bug537-test.data.asc bug894-test.asc \ - bug1223-good.asc bug1223-bogus.asc + bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc data_files = data-500 data-9000 data-32000 data-80000 plain-large |