mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
scd: Extend iso7816_select_path
* scd/iso7816.c (iso7816_select_path): Add arg top_fd. * scd/app-nks.c (do_readkey): Adjust for this change (select_ef_by_path: Ditto. * common/tlv.h: Include membuf.h. -- Including membuf.h is just for easier backporting. In 2.3 it is actually required in tlv.h but in 2.2 we right now only use it indirect.
This commit is contained in:
parent
3ce69d8387
commit
855d14d390
5 changed files with 21 additions and 10 deletions
|
@ -501,7 +501,7 @@ select_ef_by_path (app_t app, const unsigned short *path, size_t pathlen)
|
|||
|
||||
if (app->app_local->direct_path_selection)
|
||||
{
|
||||
err = iso7816_select_path (app->slot, path+1, pathlen-1);
|
||||
err = iso7816_select_path (app->slot, path+1, pathlen-1, 0);
|
||||
if (err)
|
||||
{
|
||||
log_error ("p15: error selecting path ");
|
||||
|
@ -4104,7 +4104,7 @@ app_select_p15 (app_t app)
|
|||
Using the 2f02 just works. */
|
||||
unsigned short path[1] = { 0x2f00 };
|
||||
|
||||
rc = iso7816_select_path (slot, path, 1);
|
||||
rc = iso7816_select_path (slot, path, 1, 0);
|
||||
if (!rc)
|
||||
{
|
||||
direct = 1;
|
||||
|
@ -4112,7 +4112,7 @@ app_select_p15 (app_t app)
|
|||
if (def_home_df)
|
||||
{
|
||||
path[0] = def_home_df;
|
||||
rc = iso7816_select_path (slot, path, 1);
|
||||
rc = iso7816_select_path (slot, path, 1, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue