summaryrefslogtreecommitdiffstats
path: root/agent
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 /agent
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 'agent')
-rw-r--r--agent/ChangeLog4
-rw-r--r--agent/cvt-openpgp.c7
2 files changed, 4 insertions, 7 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index f4be533f7..b636c50e3 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-08 Werner Koch <wk@g10code.com>
+
+ * cvt-openpgp.c (GCRY_PK_ECDH) [!HAVE_GCRY_PK_ECDH]: Remove.
+
2011-03-03 Ben Kibbey <bjk@luxsci.net>
* command.c (cmd_preset_passphrase): Add option --inquire.
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 690459330..1595a324b 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -28,13 +28,6 @@
#include "i18n.h"
#include "cvt-openpgp.h"
-/* Macros for compatibility with older libgcrypt versions. */
-#ifndef HAVE_GCRY_PK_ECDSA
-# define GCRY_PK_ECDH 302
-#endif
-
-
-
/* Helper to pass data via the callback to do_unprotect. */
struct try_do_unprotect_arg_s