From 591a8373a5d9567db9b1a1a48205e8a206c7b669 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 8 Aug 2016 18:46:44 +0900 Subject: 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 --- common/util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'common/util.h') diff --git a/common/util.h b/common/util.h index 29e0ec98e..3f2d1746e 100644 --- a/common/util.h +++ b/common/util.h @@ -183,6 +183,7 @@ gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata, gpg_error_t get_pk_algo_from_canon_sexp (const unsigned char *keydata, size_t keydatalen, const char **r_algo); +int get_pk_algo_from_key (gcry_sexp_t key); /*-- convert.c --*/ int hex2bin (const char *string, void *buffer, size_t length); -- cgit v1.2.3