giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IASECC/CPX: code factorization 

There are two flavours of CPX cards:
  - contact mode,
  - contactless mode
This commit is contained in:
Vincent JARDIN 2021-03-04 21:01:37 +00:00 committed by Frank Morgner
parent 4119b2c3e7
commit 76507508d7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libopensc/card-iasecc.c
View File

@ -610,6 +610,19 @@ iasecc_init_amos_or_sagem(struct sc_card *card)
LOG_FUNC_RETURN(ctx, SC_SUCCESS);
}
inline static int
iasecc_is_cpx(const struct sc_card *card)
{
switch(card->type) {
case SC_CARD_TYPE_IASECC_CPX:
case SC_CARD_TYPE_IASECC_CPXCL:
return 1;
default:
return 0;
}
return 0;
}
static int
iasecc_init_cpx(struct sc_card *card)
@ -663,9 +676,7 @@ iasecc_init(struct sc_card *card)
rv = iasecc_init_amos_or_sagem(card);
else if (card->type == SC_CARD_TYPE_IASECC_MI)
rv = iasecc_init_amos_or_sagem(card);
else if (card->type == SC_CARD_TYPE_IASECC_CPX)
rv = iasecc_init_cpx(card);
else if (card->type == SC_CARD_TYPE_IASECC_CPXCL)
else if (iasecc_is_cpx(card))
rv = iasecc_init_cpx(card);
else {
LOG_TEST_GOTO_ERR(ctx, SC_ERROR_INVALID_CARD, "");
@ -990,8 +1001,7 @@ iasecc_select_file(struct sc_card *card, const struct sc_path *path,
&& card->type != SC_CARD_TYPE_IASECC_AMOS
&& card->type != SC_CARD_TYPE_IASECC_MI
&& card->type != SC_CARD_TYPE_IASECC_MI2
&& card->type != SC_CARD_TYPE_IASECC_CPX
&& card->type != SC_CARD_TYPE_IASECC_CPXCL) {
&& !iasecc_is_cpx(card)) {
rv = SC_ERROR_NOT_SUPPORTED;
LOG_TEST_GOTO_ERR(ctx, rv, "Unsupported card");
}
@ -1004,8 +1014,7 @@ iasecc_select_file(struct sc_card *card, const struct sc_path *path,
card->type == SC_CARD_TYPE_IASECC_AMOS ||
card->type == SC_CARD_TYPE_IASECC_MI ||
card->type == SC_CARD_TYPE_IASECC_MI2 ||
card->type == SC_CARD_TYPE_IASECC_CPX ||
card->type == SC_CARD_TYPE_IASECC_CPXCL
iasecc_is_cpx(card)
) {
apdu.p2 = 0x04;
}
@ -1016,8 +1025,7 @@ iasecc_select_file(struct sc_card *card, const struct sc_path *path,
card->type == SC_CARD_TYPE_IASECC_AMOS ||
card->type == SC_CARD_TYPE_IASECC_MI ||
card->type == SC_CARD_TYPE_IASECC_MI2 ||
card->type == SC_CARD_TYPE_IASECC_CPX ||
card->type == SC_CARD_TYPE_IASECC_CPXCL) {
iasecc_is_cpx(card)) {
apdu.p2 = 0x04;
}
}