diff options
| author | Werner Koch <[email protected]> | 2019-02-26 15:42:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-02-26 16:01:46 +0000 |
| commit | c2235d994dbb1d7ddba20f89a7c02f4a27b0610c (patch) | |
| tree | 655f49c9a3436d6047f30234c7b85c36bbe18a21 /scd/app-nks.c | |
| parent | conf: New option --show-socket. (diff) | |
| download | gnupg-c2235d994dbb1d7ddba20f89a7c02f4a27b0610c.tar.gz gnupg-c2235d994dbb1d7ddba20f89a7c02f4a27b0610c.zip | |
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 <[email protected]>
Diffstat (limited to 'scd/app-nks.c')
| -rw-r--r-- | scd/app-nks.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scd/app-nks.c b/scd/app-nks.c index 0f38e7cd0..40c941616 100644 --- a/scd/app-nks.c +++ b/scd/app-nks.c @@ -618,17 +618,13 @@ do_readcert (app_t app, const char *certid, certificate parsing code in commands.c:cmd_readkey. For internal use PK and PKLEN may be NULL to just check for an existing key. */ static gpg_error_t -do_readkey (app_t app, int advanced, const char *keyid, - unsigned char **pk, size_t *pklen) +do_readkey (app_t app, const char *keyid, unsigned char **pk, size_t *pklen) { gpg_error_t err; unsigned char *buffer[2]; size_t buflen[2]; unsigned short path[1] = { 0x4500 }; - if (advanced) - return GPG_ERR_NOT_SUPPORTED; - /* We use a generic name to retrieve PK.AUT.IFD-SPK. */ if (!strcmp (keyid, "$IFDAUTHKEY") && app->app_local->nks_version >= 3) ; @@ -702,7 +698,7 @@ do_writekey (app_t app, ctrl_t ctrl, else return gpg_error (GPG_ERR_INV_ID); - if (!force && !do_readkey (app, 0, keyid, NULL, NULL)) + if (!force && !do_readkey (app, keyid, NULL, NULL)) return gpg_error (GPG_ERR_EEXIST); /* Parse the S-expression. */ |