diff options
| author | Werner Koch <wk@gnupg.org> | 2018-05-30 21:45:37 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-05-30 21:45:37 +0200 |
| commit | 97183b5c0fae05fcda942caa7df14ee6a133d846 (patch) | |
| tree | d34907a2c4f5a3b0e691fb6de5641436edc5ebab /g10/mainproc.c | |
| parent | gpg: Remove PGP6 compliance mode. (diff) | |
| download | gnupg2-97183b5c0fae05fcda942caa7df14ee6a133d846.tar.xz gnupg2-97183b5c0fae05fcda942caa7df14ee6a133d846.zip | |
gpg: Detect multiple literal plaintext packets more reliable.
* g10/mainproc.c (proc_encrypted): Bump LITERALS_SEEN.
--
GnuPG-bug-id: 4000
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index a991203ea..0341589b5 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -105,16 +105,22 @@ struct mainproc_context }; +/* Counter with the number of literal data packets seen. Note that + * this is also bumped at the end of an encryption. This counter is + * used for a basic consistency check of a received PGP message. */ +static int literals_seen; + + /*** Local prototypes. ***/ static int do_proc_packets (ctrl_t ctrl, CTX c, iobuf_t a); static void list_node (CTX c, kbnode_t node); static void proc_tree (CTX c, kbnode_t node); -static int literals_seen; /*** Functions. ***/ - +/* Reset the literal data counter. This is required to setup a new + * decryption or verification context. */ void reset_literals_seen(void) { @@ -799,6 +805,12 @@ proc_encrypted (CTX c, PACKET *pkt) free_packet (pkt, NULL); c->last_was_session_key = 0; write_status (STATUS_END_DECRYPTION); + + /* Bump the counter even if we have not seen a literal data packet + * inside an encryption container. This acts as a sentinel in case + * a misplace extra literal data packets follows after this + * encrypted packet. */ + literals_seen++; } @@ -809,6 +821,7 @@ proc_plaintext( CTX c, PACKET *pkt ) int any, clearsig, rc; kbnode_t n; + /* This is a literal data packet. Bumb a counter for later checks. */ literals_seen++; if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8)) |