security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent: Fix SOS handling with libgcrypt 1.8.

Browse Source 
* agent/cvt-openpgp.c (apply_protection): Handle opaque MPI.

--

GnuPG-bug-id: 5116
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-11-09 11:01:21 +09:00
parent c896112fa3
commit ba4f684167
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
agent/cvt-openpgp.c
View File

@ -1158,15 +1158,32 @@ apply_protection (gcry_mpi_t *array, int npkey, int nskey,
compute the required size of the data buffer. */ compute the required size of the data buffer. */
ndata = 20; /* Space for the SHA-1 checksum. */ ndata = 20; /* Space for the SHA-1 checksum. */
for (i = npkey, j = 0; i < nskey; i++, j++ ) for (i = npkey, j = 0; i < nskey; i++, j++ )
{
if (gcry_mpi_get_flag (array[i], GCRYMPI_FLAG_OPAQUE))
{
p = gcry_mpi_get_opaque (array[i], &nbits[j]);
narr[j] = (nbits[j] + 7)/8;
data = xtrymalloc_secure (narr[j]);
if (!data)
err = gpg_error_from_syserror ();
else
{
memcpy (data, p, narr[j]);
bufarr[j] = data;
err = 0;
}
}
else
{ {
err = gcry_mpi_aprint (GCRYMPI_FMT_USG, bufarr+j, narr+j, array[i]); err = gcry_mpi_aprint (GCRYMPI_FMT_USG, bufarr+j, narr+j, array[i]);
nbits[j] = gcry_mpi_get_nbits (array[i]);
}
if (err) if (err)
{ {
for (i = 0; i < j; i++) for (i = 0; i < j; i++)
xfree (bufarr[i]); xfree (bufarr[i]);
return err; return err;
} }
nbits[j] = gcry_mpi_get_nbits (array[i]);
ndata += 2 + narr[j]; ndata += 2 + narr[j];
} }