diff options
| author | Werner Koch <wk@gnupg.org> | 2011-02-03 22:04:31 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-02-03 22:04:31 +0100 |
| commit | 9f38f3918af532e1e5a1f139b89b2a1f68dec265 (patch) | |
| tree | 24e78dfa401dc29cf6dbef1338ad9aae7016ac67 /g10 | |
| parent | Add a DECRYPTION_INFO status. (diff) | |
| download | gnupg2-9f38f3918af532e1e5a1f139b89b2a1f68dec265.tar.xz gnupg2-9f38f3918af532e1e5a1f139b89b2a1f68dec265.zip | |
Fix test for gcry_pk_get_curve.
Add a compatibility fixes for the non-curve case.
Remove -lber from the dirmngr link line.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/export.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 43a8d56d0..3a1d68f2b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2011-02-03 Werner Koch <wk@g10code.com> + * export.c (transfer_format_to_openpgp) [!HAVE_GCRY_PK_GET_CURVE]: + Fix syntax error. + * decrypt-data.c: Include status.h. (decrypt_data): Emit a DECRYPTION_INFO status line. diff --git a/g10/export.c b/g10/export.c index 91a6c87f1..47185e301 100644 --- a/g10/export.c +++ b/g10/export.c @@ -656,7 +656,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk) for (idx=0; idx < npkey; idx++) if (0 #ifndef HAVE_GCRY_PK_GET_CURVE - gcry_mpi_get_flag (pk->pkey[idx], GCRYMPI_FLAG_OPAQUE) + || gcry_mpi_get_flag (pk->pkey[idx], GCRYMPI_FLAG_OPAQUE) || gcry_mpi_get_flag (skey[idx], GCRYMPI_FLAG_OPAQUE) #endif || gcry_mpi_cmp (pk->pkey[idx], skey[idx])) |