diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2019-12-19 09:30:59 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2019-12-19 09:30:59 +0100 |
| commit | b2a2df174b216881387ae849770d875cd74984c2 (patch) | |
| tree | f828bd0726783392552c0f890332ac2c11c708bd /scd/app-common.h | |
| parent | Include release information from 2.2.17 to 2.2.19 (diff) | |
| download | gnupg2-b2a2df174b216881387ae849770d875cd74984c2.tar.xz gnupg2-b2a2df174b216881387ae849770d875cd74984c2.zip | |
scd: Enhance KEYINFO command to limit listing with capability.
* scd/app-common.h: Add CAPABILITY argument to the WITH_KEYGRIP.
(app_do_with_keygrip): Likewise.
* scd/app-openpgp.c (send_keyinfo_if_available): New.
(do_with_keygrip): Support listing with CAPABILITY.
* scd/app-piv.c (do_with_keygrip): Likewise.
* scd/app.c (maybe_switch_app): Supply the argument.
(app_do_with_keygrip): Add CAPABILITY argument.
* scd/command.c (cmd_pksign, cmd_pkauth): Supply the argument.
(cmd_pkdecrypt): Likewise.
(cmd_keyinfo): Support listing with CAPABILITY.
--
GnuPG-bug-id: 4784
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'scd/app-common.h')
| -rw-r--r-- | scd/app-common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scd/app-common.h b/scd/app-common.h index 87f63bb7e..99331b04e 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -188,7 +188,7 @@ struct app_ctx_s { gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg); gpg_error_t (*with_keygrip) (app_t app, ctrl_t ctrl, int action, - const char *keygrip_str); + const char *keygrip_str, int capability); } fnc; }; @@ -301,7 +301,8 @@ gpg_error_t app_change_pin (card_t card, ctrl_t ctrl, gpg_error_t app_check_pin (card_t card, ctrl_t ctrl, const char *keyidstr, gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg); -card_t app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str); +card_t app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str, + int capability); /*-- app-openpgp.c --*/ |