security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

g10/mainproc: disable hash contexts when --skip-verify is used

Browse Source 
* g10/mainproc.c (proc_plaintext): Do not enable hash contexts when
opt.skip_verify is set.
--

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
This commit is contained in:
Jussi Kivilinna 2018-12-01 13:43:10 +02:00
parent 654e353d9b
commit 73e74de0e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/mainproc.c
View File

@ -862,7 +862,10 @@ proc_plaintext( CTX c, PACKET *pkt )
/* The onepass signature case. */ /* The onepass signature case. */
if (n->pkt->pkt.onepass_sig->digest_algo) if (n->pkt->pkt.onepass_sig->digest_algo)
{ {
gcry_md_enable (c->mfx.md, n->pkt->pkt.onepass_sig->digest_algo); if (!opt.skip_verify)
gcry_md_enable (c->mfx.md,
n->pkt->pkt.onepass_sig->digest_algo);
any = 1; any = 1;
} }
} }
@ -880,7 +883,8 @@ proc_plaintext( CTX c, PACKET *pkt )
* documents. */ * documents. */
clearsig = (*data == 0x01); clearsig = (*data == 0x01);
for (data++, datalen--; datalen; datalen--, data++) for (data++, datalen--; datalen; datalen--, data++)
gcry_md_enable (c->mfx.md, *data); if (!opt.skip_verify)
gcry_md_enable (c->mfx.md, *data);
any = 1; any = 1;
break; /* Stop here as one-pass signature packets are not break; /* Stop here as one-pass signature packets are not
expected. */ expected. */
@ -888,7 +892,8 @@ proc_plaintext( CTX c, PACKET *pkt )
else if (n->pkt->pkttype == PKT_SIGNATURE) else if (n->pkt->pkttype == PKT_SIGNATURE)
{ {
/* The SIG+LITERAL case that PGP used to use. */ /* The SIG+LITERAL case that PGP used to use. */
gcry_md_enable ( c->mfx.md, n->pkt->pkt.signature->digest_algo ); if (!opt.skip_verify)
gcry_md_enable (c->mfx.md, n->pkt->pkt.signature->digest_algo);
any = 1; any = 1;
} }
} }