Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IASECC/CPX: fix path errors #2278

Merged
merged 2 commits into from
Apr 26, 2021
Merged

IASECC/CPX: fix path errors #2278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86696a4
IASECC/CPX: fix APDU errors for SE get data
vjardin Mar 29, 2021
2c88f9d
IASECC/CPX: Fix SDO path
vjardin Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/libopensc/card-iasecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,11 @@ iasecc_se_get_info(struct sc_card *card, struct iasecc_se_info *se)

LOG_FUNC_CALLED(ctx);

if (iasecc_is_cpx(card)) {
rv = iasecc_select_mf(card, NULL);
LOG_TEST_RET(ctx, rv, "MF invalid");
}

if (se->reference > IASECC_SE_REF_MAX)
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);

Expand Down Expand Up @@ -2866,6 +2871,34 @@ iasecc_sdo_get_tagged_data(struct sc_card *card, int sdo_tag, struct iasecc_sdo

LOG_FUNC_CALLED(ctx);

sc_log(ctx, "sdo_tag=0x%x sdo_ref=0x%x sdo_class=0x%x", sdo_tag,
sdo->sdo_ref, sdo->sdo_class);

/* XXX: for the CPx, the SDO are available from some specific path */
if (iasecc_is_cpx(card)) {
struct sc_path path;
char *path_str = NULL;
switch(sdo_tag) {
case IASECC_SDO_PRVKEY_TAG:
/* APDU 00 CB 3F FF 0B 4D 09 70 07 BF 90 02 03 7F 48 80 */
path_str = "3F00:0001";
break;
case IASECC_SDO_CHV_TAG:
/* APDU 00 CB 3F FF 0B 4D 09 70 07 BF 81 01 03 7F 41 80 */
path_str = "3F00";
break;
default:
path_str = NULL;
break;
}
if (path_str) {
sc_log(ctx, "Warning: Enforce the path=%s", path_str);
sc_format_path(path_str, &path);
rv = iasecc_select_file(card, &path, NULL);
LOG_TEST_RET(ctx, rv, "path error");
}
}

sbuf[offs--] = 0x80;
sbuf[offs--] = sdo_tag & 0xFF;
if ((sdo_tag >> 8) & 0xFF)
Expand Down