summaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-03-08 12:23:59 +0100
committerWerner Koch <wk@gnupg.org>2011-03-08 12:23:59 +0100
commit327af90594204db9683fcee5c8c6b8098c8da37a (patch)
tree1ef036bbadb924c19d24c3b75a299c3efa012f95 /g10/import.c
parentAdded option --inquire to PRESET_PASSPHRASE. Note that the inquired passphras... (diff)
downloadgnupg2-327af90594204db9683fcee5c8c6b8098c8da37a.tar.xz
gnupg2-327af90594204db9683fcee5c8c6b8098c8da37a.zip
Require libgcrypt 1.5
Without Libgcrypt 1.5 is was not possible to use ECC keys. ECC is major new feature and thus it does not make sense to allow building with an older Libgcrypt without supporting ECC. Also fixed a few missing prototypes.
Diffstat (limited to 'g10/import.c')
-rw-r--r--g10/import.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c
index 99398c762..39968ff6f 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1253,11 +1253,8 @@ transfer_secret_keys (ctrl_t ctrl, struct stats_s *stats, kbnode_t sec_keyblock)
err = gpg_error_from_syserror ();
else
{
-#ifdef HAVE_GCRY_PK_GET_CURVE /* Also ensures availability of get_param. */
gcry_sexp_t cparam = gcry_pk_get_param (GCRY_PK_ECDSA, curve);
-#else
- gcry_sexp_t cparam = NULL;
-#endif
+
xfree (curve);
if (!cparam)
err = gpg_error (GPG_ERR_UNKNOWN_CURVE);