From 72a7d45a230bf28e2ba7e8a57b702c98998ea0a3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 5 May 2020 08:07:11 +0200 Subject: [PATCH] scd: Extend an internal function to also return the algo. * scd/app-help.c (app_help_get_keygrip_string_pk): Add optional arg r_algo. Change all callers. (app_help_get_keygrip_string): Ditto. Signed-off-by: Werner Koch --- scd/app-common.h | 5 +++-- scd/app-dinsig.c | 2 +- scd/app-help.c | 20 +++++++++++++------- scd/app-p15.c | 2 +- scd/app-sc-hsm.c | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/scd/app-common.h b/scd/app-common.h index f16c24087..9240c5f05 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -206,9 +206,10 @@ app_get_slot (app_t app) unsigned int app_help_count_bits (const unsigned char *a, size_t len); gpg_error_t app_help_get_keygrip_string_pk (const void *pk, size_t pklen, char *hexkeygrip, - gcry_sexp_t *r_pkey); + gcry_sexp_t *r_pkey, + int *r_algo); gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip, - gcry_sexp_t *r_pkey); + gcry_sexp_t *r_pkey, int *r_algo); size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff); diff --git a/scd/app-dinsig.c b/scd/app-dinsig.c index 84a06fce0..5a2713e6b 100644 --- a/scd/app-dinsig.c +++ b/scd/app-dinsig.c @@ -136,7 +136,7 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags) ksba_cert_release (cert); return err; } - err = app_help_get_keygrip_string (cert, hexkeygrip, NULL); + err = app_help_get_keygrip_string (cert, hexkeygrip, NULL, NULL); if (err) { log_error ("failed to calculate the keygrip for FID 0x%04X\n", fid); diff --git a/scd/app-help.c b/scd/app-help.c index a54145840..476eecf2f 100644 --- a/scd/app-help.c +++ b/scd/app-help.c @@ -54,12 +54,13 @@ app_help_count_bits (const unsigned char *a, size_t len) /* Return the KEYGRIP for the canonical encoded public key (PK,PKLEN) * as an hex encoded string in the user provided buffer HEXKEYGRIP * which must be of at least 41 bytes. If R_PKEY is not NULL and the - * function succeeded, the S-expression representing the key is - * stored there. The caller needs to call gcry_sexp_release on - * that. */ + * function succeeded, the S-expression representing the key is stored + * there. The caller needs to call gcry_sexp_release on that. If + * R_ALGO is not NULL the public key algorithm id of Libgcrypt is + * stored there. */ gpg_error_t app_help_get_keygrip_string_pk (const void *pk, size_t pklen, char *hexkeygrip, - gcry_sexp_t *r_pkey) + gcry_sexp_t *r_pkey, int *r_algo) { gpg_error_t err; gcry_sexp_t s_pkey; @@ -77,6 +78,9 @@ app_help_get_keygrip_string_pk (const void *pk, size_t pklen, char *hexkeygrip, return gpg_error (GPG_ERR_GENERAL); /* Failed to calculate the keygrip.*/ } + if (r_algo) + *r_algo = get_pk_algo_from_key (s_pkey); + if (r_pkey) *r_pkey = s_pkey; else @@ -92,10 +96,11 @@ app_help_get_keygrip_string_pk (const void *pk, size_t pklen, char *hexkeygrip, * string in the user provided buffer HEXKEYGRIP which must be of at * least 41 bytes. If R_PKEY is not NULL and the function succeeded, * the S-expression representing the key is stored there. The caller - * needs to call gcry_sexp_release on that. */ + * needs to call gcry_sexp_release on that. If R_ALGO is not NULL the + * public key algorithm id of Libgcrypt is stored there. */ gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip, - gcry_sexp_t *r_pkey) + gcry_sexp_t *r_pkey, int *r_algo) { gpg_error_t err; ksba_sexp_t p; @@ -110,7 +115,8 @@ app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip, n = gcry_sexp_canon_len (p, 0, NULL, NULL); if (!n) return gpg_error (GPG_ERR_INV_SEXP); - err = app_help_get_keygrip_string_pk ((void*)p, n, hexkeygrip, r_pkey); + err = app_help_get_keygrip_string_pk ((void*)p, n, hexkeygrip, + r_pkey, r_algo); ksba_free (p); return err; } diff --git a/scd/app-p15.c b/scd/app-p15.c index 687c6ad32..23d68d0a4 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2689,7 +2689,7 @@ keygrip_from_prkdf (app_t app, prkdf_object_t prkdf) err = ksba_cert_init_from_mem (cert, der, derlen); xfree (der); if (!err) - err = app_help_get_keygrip_string (cert, prkdf->keygrip, &s_pkey); + err = app_help_get_keygrip_string (cert, prkdf->keygrip, &s_pkey, NULL); if (!err) { /* Try to get the CN and the SerialNumber from the certificate; diff --git a/scd/app-sc-hsm.c b/scd/app-sc-hsm.c index cc5771e2c..1425b435b 100644 --- a/scd/app-sc-hsm.c +++ b/scd/app-sc-hsm.c @@ -1353,7 +1353,7 @@ keygripstr_from_prkdf (app_t app, prkdf_object_t prkdf, char *r_gripstr) err = ksba_cert_init_from_mem (cert, der, derlen); xfree (der); if (!err) - err = app_help_get_keygrip_string (cert, r_gripstr, NULL); + err = app_help_get_keygrip_string (cert, r_gripstr, NULL, NULL); ksba_cert_release (cert); return err;