diff options
| author | NIIBE Yutaka <[email protected]> | 2014-04-28 01:36:16 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-04-28 01:36:16 +0000 |
| commit | 21dab64030c95a909767bf6d8f99e8476f9df8a2 (patch) | |
| tree | 78338ccea643a67aadb268d96980e4e917ef5360 /agent/gpg-agent.c | |
| parent | gpg: Pass --homedir to gpg-agent. (diff) | |
| download | gnupg-21dab64030c95a909767bf6d8f99e8476f9df8a2.tar.gz gnupg-21dab64030c95a909767bf6d8f99e8476f9df8a2.zip | |
ECC Fixes.
* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
(convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
does not distinguish the detail.
(do_unprotect, convert_from_openpgp_main): Don't call
map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
not the value defined by OpenPGP.
(convert_to_openpgp): It's "ecc".
* agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
* g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
* g10/pubkey-enc.c (get_it): Fix swapping the fields error.
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 8078cba25..5319e4917 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2546,12 +2546,3 @@ 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)); -} |