diff options
| -rw-r--r-- | g10/build-packet.c | 6 | ||||
| -rw-r--r-- | g10/keyid.c | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index e98698728..5cc03cf65 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -398,7 +398,8 @@ do_secret_key( IOBUF out, int ctb, PKT_secret_key *sk ) assert (gcry_mpi_get_flag (sk->skey[npkey], GCRYMPI_FLAG_OPAQUE)); p = gcry_mpi_get_opaque (sk->skey[npkey], &ndatabits ); - iobuf_write (a, p, (ndatabits+7)/8 ); + if (p) + iobuf_write (a, p, (ndatabits+7)/8 ); } else if ( sk->is_protected ) { @@ -410,7 +411,8 @@ do_secret_key( IOBUF out, int ctb, PKT_secret_key *sk ) assert (gcry_mpi_get_flag (sk->skey[i], GCRYMPI_FLAG_OPAQUE)); p = gcry_mpi_get_opaque (sk->skey[i], &ndatabits); - iobuf_write (a, p, (ndatabits+7)/8); + if (p) + iobuf_write (a, p, (ndatabits+7)/8); } write_16(a, sk->csum ); } diff --git a/g10/keyid.c b/g10/keyid.c index 6af0f4843..ef6ee1c11 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -115,14 +115,18 @@ hash_public_key( gcry_md_hd_t md, PKT_public_key *pk ) if(npkey==0 && pk->pkey[0] && gcry_mpi_get_flag (pk->pkey[0], GCRYMPI_FLAG_OPAQUE)) { - gcry_md_write (md, pp[0], nn[0]); + if (pp[0]) + gcry_md_write (md, pp[0], nn[0]); } else - for(i=0; i < npkey; i++ ) - { - gcry_md_write ( md, pp[i], nn[i] ); - xfree(pp[i]); - } + { + for(i=0; i < npkey; i++ ) + { + if (pp[i]) + gcry_md_write ( md, pp[i], nn[i] ); + xfree(pp[i]); + } + } } static gcry_md_hd_t |