diff options
| author | NIIBE Yutaka <[email protected]> | 2016-08-08 09:46:44 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-08-08 09:55:53 +0000 |
| commit | 591a8373a5d9567db9b1a1a48205e8a206c7b669 (patch) | |
| tree | 92a30bd5c7ee410c6a146935343a70974217182f /agent/gpg-agent.c | |
| parent | tests: Add openpgp/gpgv-forged-keyring.scm. (diff) | |
| download | gnupg-591a8373a5d9567db9b1a1a48205e8a206c7b669.tar.gz gnupg-591a8373a5d9567db9b1a1a48205e8a206c7b669.zip | |
agent: More clean up of SSH support.
* common/util.h (get_pk_algo_from_key): New.
* common/sexputil.c (get_pk_algo_from_key): The implementation.
* agent/gpg-agent.c: Remove include of openpgpdefs.h.
* agent/command-ssh.c (struct ssh_key_type_spec): Use integer ALGO.
(ssh_key_types): Update with GCRY_PK_*.
(make_cstring, sexp_extract_identifier): Remove.
(sexp_key_construct): Use gcry_pk_algo_name to get ALGO string.
(ssh_key_to_blob): Use cadr to get value list.
(ssh_key_type_lookup): Lookup with integer ALGO.
(ssh_receive_key): Follow the change of ssh_key_type_lookup.
(ssh_send_key_public): Likewise. Use get_pk_algo_from_key to get ALGO.
--
This fixes the regresson introduced by the commit
894789c3299dc47a8c1ccaaa7070382f0fae0262.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 8a957cc36..8d6ecfc8e 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -58,7 +58,6 @@ #include "gc-opt-flags.h" #include "exechelp.h" #include "asshelp.h" -#include "openpgpdefs.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */ #include "../common/init.h" |