aboutsummaryrefslogtreecommitdiffstats
path: root/scd/app-nks.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2017-03-06 04:39:46 +0000
committerNIIBE Yutaka <[email protected]>2017-03-06 04:39:46 +0000
commit0703de01c8fbc417a99ecf8e950fc306b8c8ac9c (patch)
tree01f253d6b5c5ddea32c9ac744602bad4b27116f0 /scd/app-nks.c
parentpo: Update Japanese translation. (diff)
downloadgnupg-0703de01c8fbc417a99ecf8e950fc306b8c8ac9c.tar.gz
gnupg-0703de01c8fbc417a99ecf8e950fc306b8c8ac9c.zip
scd: Fix API of select_file/_path.
* scd/iso7816.c (iso7816_select_file, iso7816_select_path): Remove unused arguments. * scd/app-dinsig.c (do_readcert): Follow the change. * scd/app-help.c (app_help_read_length_of_cert): Likewise. * scd/app-nks.c (keygripstr_from_pk_file, do_readcert, do_readkey) (switch_application): Likewise. * scd/app-p15.c (select_and_read_binary, select_ef_by_path) (micardo_mse, app_select_p15): Likewise. * scd/app.c (app_new_register): Likewise. -- Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/app-nks.c')
-rw-r--r--scd/app-nks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 4442a100b..98dd5884f 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -151,7 +151,7 @@ keygripstr_from_pk_file (app_t app, int fid, char *r_gripstr)
int i;
int offset[2] = { 0, 0 };
- err = iso7816_select_file (app->slot, fid, 0, NULL, NULL);
+ err = iso7816_select_file (app->slot, fid, 0);
if (err)
return err;
err = iso7816_read_record (app->slot, 1, 1, 0, &buffer[0], &buflen[0]);
@@ -528,7 +528,7 @@ do_readcert (app_t app, const char *certid,
/* Read the entire file. fixme: This could be optimized by first
reading the header to figure out how long the certificate
actually is. */
- err = iso7816_select_file (app->slot, fid, 0, NULL, NULL);
+ err = iso7816_select_file (app->slot, fid, 0);
if (err)
{
log_error ("error selecting FID 0x%04X: %s\n", fid, gpg_strerror (err));
@@ -636,7 +636,7 @@ do_readkey (app_t app, int advanced, const char *keyid,
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
/* Access the KEYD file which is always in the master directory. */
- err = iso7816_select_path (app->slot, path, DIM (path), NULL, NULL);
+ err = iso7816_select_path (app->slot, path, DIM (path));
if (err)
return err;
/* Due to the above select we need to re-select our application. */
@@ -1354,7 +1354,7 @@ switch_application (app_t app, int enable_sigg)
app->app_local->sigg_msig_checked = 1;
app->app_local->sigg_is_msig = 1;
- err = iso7816_select_file (app->slot, 0x5349, 0, NULL, NULL);
+ err = iso7816_select_file (app->slot, 0x5349, 0);
if (!err)
err = iso7816_read_record (app->slot, 1, 1, 0, &buffer, &buflen);
if (!err)