security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

agent: Fix error from do_encryption.

Browse Source 
* agent/protect.c (do_encryption): Don't mask failure of OUTBUF
allocation.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-05-31 18:42:55 +09:00
parent 8defb21d34
commit c03e0eb01d
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
agent/protect.c
View File

@ -381,7 +381,10 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
outbuf = gcry_malloc_secure (outlen); outbuf = gcry_malloc_secure (outlen);
} }
if (!outbuf) if (!outbuf)
{
rc = out_of_core (); rc = out_of_core ();
goto leave;
}
/* Allocate a buffer for the nonce and the salt. */ /* Allocate a buffer for the nonce and the salt. */
if (!rc) if (!rc)
@ -421,11 +424,13 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
} }
} }
if (rc)
goto leave;
/* Set the IV/nonce. */ /* Set the IV/nonce. */
if (!rc)
{
rc = gcry_cipher_setiv (hd, iv, use_ocb? 12 : blklen); rc = gcry_cipher_setiv (hd, iv, use_ocb? 12 : blklen);
} if (rc)
goto leave;
if (use_ocb) if (use_ocb)
{ {
@ -436,7 +441,6 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
if (!rc) if (!rc)
rc = gcry_cipher_authenticate rc = gcry_cipher_authenticate
(hd, protbegin+protlen, hashlen - (protbegin+protlen - hashbegin)); (hd, protbegin+protlen, hashlen - (protbegin+protlen - hashbegin));
} }
else else
{ {
@ -500,14 +504,11 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
} }
} }
if (rc)
goto leave;
/* Release cipher handle and check for errors. */ /* Release cipher handle and check for errors. */
gcry_cipher_close (hd); gcry_cipher_close (hd);
if (rc)
{
xfree (iv);
xfree (outbuf);
return rc;
}
/* Now allocate the buffer we want to return. This is /* Now allocate the buffer we want to return. This is
@ -546,6 +547,12 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
xfree (iv); xfree (iv);
xfree (outbuf); xfree (outbuf);
return 0; return 0;
leave:
gcry_cipher_close (hd);
xfree (iv);
xfree (outbuf);
return rc;
} }