security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

.

Browse source
This commit is contained in:
Werner Koch 2005-04-20 19:19:24 +00:00
parent cb1840720a
commit 526ed521a7
5 changed files with 93 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
agent/minip12.c
View file

@ -486,6 +486,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
buffer = p = plain;
/* { */
/* # warning debug code is enabled */
/* FILE *fp = fopen ("tmp-rc2-plain.der", "wb"); */
/* if (!fp || fwrite (p, n, 1, fp) != 1) */
/* exit (2); */
@ -586,8 +587,10 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
}
/* Ugly hack to cope with the padding: Forget about the rest if
that it is less than the cipher's block length. */
if (n < 8)
that is less or equal to the cipher's block length. We can
reasonable assume that all valid data will be longer than
just one block. */
if (n <= 8)
n = 0;
/* Skip the optional SET with the pkcs12 cert attributes. */
@ -602,7 +605,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
{ /* The optional SET. */
p += ti.length;
n -= ti.length;
if (n < 8)
if (n <= 8)
n = 0;
if (n && parse_tag (&p, &n, &ti))
goto bailout;