From c2235d994dbb1d7ddba20f89a7c02f4a27b0610c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 26 Feb 2019 16:42:50 +0100 Subject: scd: Simplify the app_readkey parameters. * scd/app-help.c (app_help_pubkey_from_cert): New. * scd/command.c (cmd_readkey): Refactor to use that new function and handle the --advanced flag only here. * scd/app.c (app_readkey): Remove parm advanced. * scd/app-common.h (struct app_ctx_s): Remove parm advanced from the readkey member. * scd/app-nks.c (do_readkey): Adjust for removed parm. * scd/app-piv.c (do_readkey): Ditto. * scd/app-openpgp.c (do_readkey): Ditto. Signed-off-by: Werner Koch --- scd/app.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scd/app.c') diff --git a/scd/app.c b/scd/app.c index 8d4d1c032..ada1eb963 100644 --- a/scd/app.c +++ b/scd/app.c @@ -692,7 +692,7 @@ app_readcert (app_t app, ctrl_t ctrl, const char *certid, This function might not be supported by all applications. */ gpg_error_t -app_readkey (app_t app, ctrl_t ctrl, int advanced, const char *keyid, +app_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned char **pk, size_t *pklen) { gpg_error_t err; @@ -711,7 +711,7 @@ app_readkey (app_t app, ctrl_t ctrl, int advanced, const char *keyid, err = lock_app (app, ctrl); if (err) return err; - err= app->fnc.readkey (app, advanced, keyid, pk, pklen); + err= app->fnc.readkey (app, keyid, pk, pklen); unlock_app (app); return err; } -- cgit v1.2.3