From 2bbdeb8ee87a6c7ec211be16391a11b7c6030bed Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 1 Mar 2017 13:36:01 +0100 Subject: gpg: Allow creating keys using an existing ECC key. * common/sexputil.c (get_pk_algo_from_canon_sexp): Remove arg R_ALGO. Change to return the algo id. Reimplement using get_pk_algo_from_key. * g10/keygen.c (check_keygrip): Adjust for change. * sm/certreqgen-ui.c (check_keygrip): Ditto. -- GnuPG-bug-id: 2976 Signed-off-by: Werner Koch --- common/util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/util.h') diff --git a/common/util.h b/common/util.h index 4e871d289..c0aa57a1e 100644 --- a/common/util.h +++ b/common/util.h @@ -195,10 +195,10 @@ gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata, size_t *r_nlen, unsigned char const **r_e, size_t *r_elen); -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); +int get_pk_algo_from_canon_sexp (const unsigned char *keydata, + size_t keydatalen); /*-- convert.c --*/ int hex2bin (const char *string, void *buffer, size_t length); -- cgit v1.2.3