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

kbx: Don't put zero-byte for ECC.

Browse Source 
* kbx/keybox-openpgp.c (parse_key): Only put zero for non-ECC.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-11-02 15:34:03 +09:00
parent 90c3d623ce
commit 8211d0bc3b
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kbx/keybox-openpgp.c
View File

@ -369,23 +369,24 @@ parse_key (const unsigned char *data, size_t datalen,
/* Note: Starting here we need to jump to leave on error. */ /* Note: Starting here we need to jump to leave on error. */
/* Make sure the MPIs are unsigned. */ /* For non-ECC, make sure the MPIs are unsigned. */
for (i=0; i < npkey; i++) if (!is_ecc)
{ for (i=0; i < npkey; i++)
if (!keyparm[i].len || (keyparm[i].mpi[0] & 0x80)) {
{ if (!keyparm[i].len || (keyparm[i].mpi[0] & 0x80))
helpmpibuf[i] = xtrymalloc (1+keyparm[i].len); {
if (!helpmpibuf[i]) helpmpibuf[i] = xtrymalloc (1+keyparm[i].len);
{ if (!helpmpibuf[i])
err = gpg_error_from_syserror (); {
goto leave; err = gpg_error_from_syserror ();
} goto leave;
helpmpibuf[i][0] = 0; }
memcpy (helpmpibuf[i]+1, keyparm[i].mpi, keyparm[i].len); helpmpibuf[i][0] = 0;
keyparm[i].mpi = helpmpibuf[i]; memcpy (helpmpibuf[i]+1, keyparm[i].mpi, keyparm[i].len);
keyparm[i].len++; keyparm[i].mpi = helpmpibuf[i];
} keyparm[i].len++;
} }
}
err = keygrip_from_keyparm (algorithm, keyparm, ki->grip); err = keygrip_from_keyparm (algorithm, keyparm, ki->grip);
if (err) if (err)