aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-02-03 15:39:03 +0000
committerWerner Koch <[email protected]>2011-02-03 15:39:03 +0000
commit38904b697c4d27a70281149c6070e6dfca4e893b (patch)
tree72ae98a01f64dbe2df74d9687faba0c97159d799 /agent/gpg-agent.c
parentAdd gitattributes (diff)
parentFinished ECC integration. (diff)
downloadgnupg-ecc-integration-done.tar.gz
gnupg-ecc-integration-done.zip
Merge branch 'ECC-INTEGRATION-2-1'ecc-integration-done
Diffstat (limited to 'agent/gpg-agent.c')
-rw-r--r--agent/gpg-agent.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index ca150b471..db9039278 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -51,6 +51,7 @@
#include "gc-opt-flags.h"
#include "exechelp.h"
#include "asshelp.h"
+#include "../include/cipher.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */
enum cmd_and_opt_values
{ aNull = 0,
@@ -2301,3 +2302,12 @@ check_for_running_agent (int silent, int mode)
assuan_release (ctx);
return 0;
}
+
+/* TODO: it is also in misc, which is not linked with the agent */
+/* FIXME: The agent should not know about openpgp internals - weel
+ except for some stuff in cvt-openpgp. */
+int
+map_pk_openpgp_to_gcry (int algo)
+{
+ return (algo==PUBKEY_ALGO_ECDSA ? GCRY_PK_ECDSA : (algo==PUBKEY_ALGO_ECDH ? GCRY_PK_ECDH : algo));
+}