mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Fix segv due to NULL value stored as opaque MPI.
* g10/build-packet.c (gpg_mpi_write): Check for NULL return from
gcry_mpi_get_opaque.
(gpg_mpi_write_nohdr, do_key): Ditto.
* g10/keyid.c (hash_public_key): Ditto.
--
This fix extends commmit 0835d2f44e
.
gpg2 --export --no-default-keyring --keyring TESTDATA
With TESTDATA being below after unpacking.
-----BEGIN PGP ARMORED FILE-----
mBMEhdkMmS8BcX8F//8F5voEhQAQmBMEnAAAZwAAo4D/f/8EhQAAAIAEnP8EhQAQ
iBMEnP8AAAAABf8jIID///8EhQYQmBMEnIUAEIgTBKT/AAAAAAUAACCA/f//BIUA
EJgTBJx/AP8ABPPzBJx/AP8ABPPz
=2yE0
-----END PGP ARMORED FILE-----
Reported-by: Jodie Cunningham
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
07a71da479
commit
76c8122adf
2 changed files with 18 additions and 10 deletions
|
@ -171,7 +171,7 @@ gpg_mpi_write (iobuf_t out, gcry_mpi_t a)
|
|||
lenhdr[0] = nbits >> 8;
|
||||
lenhdr[1] = nbits;
|
||||
rc = iobuf_write (out, lenhdr, 2);
|
||||
if (!rc)
|
||||
if (!rc && p)
|
||||
rc = iobuf_write (out, p, (nbits+7)/8);
|
||||
}
|
||||
else
|
||||
|
@ -209,7 +209,7 @@ gpg_mpi_write_nohdr (iobuf_t out, gcry_mpi_t a)
|
|||
const void *p;
|
||||
|
||||
p = gcry_mpi_get_opaque (a, &nbits);
|
||||
rc = iobuf_write (out, p, (nbits+7)/8);
|
||||
rc = p ? iobuf_write (out, p, (nbits+7)/8) : 0;
|
||||
}
|
||||
else
|
||||
rc = gpg_error (GPG_ERR_BAD_MPI);
|
||||
|
@ -393,7 +393,8 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
|
|||
|
||||
assert (gcry_mpi_get_flag (pk->pkey[npkey], GCRYMPI_FLAG_OPAQUE));
|
||||
p = gcry_mpi_get_opaque (pk->pkey[npkey], &ndatabits);
|
||||
iobuf_write (a, p, (ndatabits+7)/8 );
|
||||
if (p)
|
||||
iobuf_write (a, p, (ndatabits+7)/8 );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue