security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

gpg: Detect multiple literal plaintext packets more reliable.

Browse Source 
* g10/mainproc.c (proc_encrypted): Bump LITERALS_SEEN.
--

GnuPG-bug-id: 4000
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 97183b5c0fae05fcda942caa7df14ee6a133d846)
This commit is contained in:
Werner Koch 2018-05-30 21:45:37 +02:00
parent 866667765f
commit 2f2b1d1da9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g10/mainproc.c
View File

@ -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. ***/ /*** Local prototypes. ***/
static int do_proc_packets (ctrl_t ctrl, CTX c, iobuf_t a); static int do_proc_packets (ctrl_t ctrl, CTX c, iobuf_t a);
static void list_node (CTX c, kbnode_t node); static void list_node (CTX c, kbnode_t node);
static void proc_tree (CTX c, kbnode_t node); static void proc_tree (CTX c, kbnode_t node);
static int literals_seen;
/*** Functions. ***/ /*** Functions. ***/
/* Reset the literal data counter. This is required to setup a new
* decryption or verification context. */
void void
reset_literals_seen(void) reset_literals_seen(void)
{ {
@ -701,6 +707,12 @@ proc_encrypted (CTX c, PACKET *pkt)
free_packet (pkt, NULL); free_packet (pkt, NULL);
c->last_was_session_key = 0; c->last_was_session_key = 0;
write_status (STATUS_END_DECRYPTION); 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++;
} }
@ -711,6 +723,7 @@ proc_plaintext( CTX c, PACKET *pkt )
int any, clearsig, rc; int any, clearsig, rc;
kbnode_t n; kbnode_t n;
/* This is a literal data packet. Bumb a counter for later checks. */
literals_seen++; literals_seen++;
if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8)) if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8))