This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15746
Change subject: iso7816_fsm: Handle WTIME expiry during ATR reception
......................................................................
iso7816_fsm: Handle WTIME expiry during ATR reception
There are some cards that state a wrong length of the historical
bytes in their ATR header, resulting in WTIME expiry. Let's dispatch
ISO7816_E_WTIME_EXP into the ATR FSM and treat it as normal ATR_DONE if
it happens during rx of historical bytes or TCK.
Also introdcue an ISO7816_E_ATR_ERR_IND for those situations where
waiting time expiration occurs during reception of TS/T0/TA/TB/TC/TD
bytes.
Change-Id: I62d47cb5e06b480941c67122f3c7d7a462ea2099
---
M ccid_common/iso7816_fsm.c
M ccid_common/iso7816_fsm.h
2 files changed, 58 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/46/15746/1
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index 8705ad9..af7892c 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -141,6 +141,7 @@
{ ISO7816_E_RX_ERR_IND, "RX_ERR_IND" },
{ ISO7816_E_TX_ERR_IND, "TX_ERR_IND" },
{ ISO7816_E_ATR_DONE_IND, "ATR_DONE_IND" },
+ { ISO7816_E_ATR_ERR_IND, "ATR_ERR_IND" },
{ ISO7816_E_TPDU_DONE_IND, "TPDU_DONE_IND" },
{ ISO7816_E_XCEIVE_TPDU_CMD, "XCEIVE_TPDU_CMD" },
/* allstate events */
@@ -251,6 +252,10 @@
osmo_fsm_inst_state_chg(fi, ISO7816_S_IN_ATR, 0, 0);
osmo_fsm_inst_dispatch(ip->atr_fi, event, data);
break;
+ case ISO7816_E_WTIME_EXP:
+ ip->user_cb(fi, event, 0, NULL);
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -265,6 +270,7 @@
switch (event) {
case ISO7816_E_RX_SINGLE:
case ISO7816_E_RX_ERR_IND:
+ case ISO7816_E_WTIME_EXP:
/* simply pass this through to the child FSM for the ATR */
osmo_fsm_inst_dispatch(ip->atr_fi, event, data);
break;
@@ -275,6 +281,10 @@
/* notify user about ATR */
ip->user_cb(fi, event, 0, atr);
break;
+ case ISO7816_E_ATR_ERR_IND:
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ ip->user_cb(fi, event, 0, atr);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -326,6 +336,10 @@
/* hand finished TPDU to user */
ip->user_cb(fi, event, 0, apdu);
break;
+ case ISO7816_E_WTIME_EXP:
+ /* FIXME: power off? */
+ osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -336,7 +350,6 @@
OSMO_ASSERT(fi->fsm == &iso7816_3_fsm);
switch (event) {
- case ISO7816_E_WTIME_EXP:
case ISO7816_E_HW_ERR_IND:
case ISO7816_E_CARD_REMOVAL:
/* FIXME: power off? */
@@ -366,7 +379,8 @@
},
[ISO7816_S_WAIT_ATR] = {
.name = "WAIT_ATR",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_IN_ATR),
.action = iso7816_3_wait_atr_action,
@@ -375,7 +389,9 @@
.name = "IN_ATR",
.in_event_mask = S(ISO7816_E_RX_SINGLE) |
S(ISO7816_E_RX_ERR_IND) |
- S(ISO7816_E_ATR_DONE_IND),
+ S(ISO7816_E_ATR_DONE_IND) |
+ S(ISO7816_E_ATR_ERR_IND) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_IN_ATR) |
S(ISO7816_S_WAIT_TPDU),
@@ -398,7 +414,8 @@
S(ISO7816_E_TX_COMPL) |
S(ISO7816_E_RX_ERR_IND) |
S(ISO7816_E_TX_ERR_IND) |
- S(ISO7816_E_TPDU_DONE_IND),
+ S(ISO7816_E_TPDU_DONE_IND) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_WAIT_TPDU) |
S(ISO7816_S_IN_TPDU),
@@ -435,8 +452,7 @@
.log_subsys = DISO7816,
.event_names = iso7816_3_event_names,
.allstate_action = iso7816_3_allstate_action,
- .allstate_event_mask = S(ISO7816_E_WTIME_EXP) |
- S(ISO7816_E_CARD_REMOVAL) |
+ .allstate_event_mask = S(ISO7816_E_CARD_REMOVAL) |
S(ISO7816_E_POWER_DN_IND) |
S(ISO7816_E_RESET_ACT_IND) |
S(ISO7816_E_HW_ERR_IND) |
@@ -550,6 +566,9 @@
}
atp->i = 0; /* first interface byte sub-group is coming (T0 is kind of TD0) */
break;
+ case ISO7816_E_WTIME_EXP:
+ osmo_fsm_inst_dispatch(fi->proc.parent, ISO7816_E_ATR_ERR_IND, NULL);
+ break;
default:
OSMO_ASSERT(0);
}
@@ -642,6 +661,20 @@
OSMO_ASSERT(0);
}
break;
+ case ISO7816_E_WTIME_EXP:
+ switch (fi->state) {
+ case ATR_S_WAIT_HIST:
+ case ATR_S_WAIT_TCK:
+ /* Some cards have an ATR with long indication of historical bytes */
+ /* FIXME: should we check the checksum? */
+ osmo_fsm_inst_state_chg(fi, ATR_S_DONE, 0, 0);
+ osmo_fsm_inst_dispatch(fi->proc.parent, ISO7816_E_ATR_DONE_IND, atp->atr);
+ break;
+ default:
+ osmo_fsm_inst_dispatch(fi->proc.parent, ISO7816_E_ATR_ERR_IND, NULL);
+ break;
+ }
+ break;
default:
OSMO_ASSERT(0);
}
@@ -650,7 +683,8 @@
static const struct osmo_fsm_state atr_states[] = {
[ATR_S_WAIT_TS] = {
.name = "WAIT_TS",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_T0),
.action = atr_wait_ts_action,
@@ -658,7 +692,8 @@
},
[ATR_S_WAIT_T0] = {
.name = "WAIT_T0",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TA) |
S(ATR_S_WAIT_TB) |
@@ -671,7 +706,8 @@
},
[ATR_S_WAIT_TA] = {
.name = "WAIT_TA",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TB) |
S(ATR_S_WAIT_TC) |
@@ -683,7 +719,8 @@
},
[ATR_S_WAIT_TB] = {
.name = "WAIT_TB",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TC) |
S(ATR_S_WAIT_TD) |
@@ -694,7 +731,8 @@
},
[ATR_S_WAIT_TC] = {
.name = "WAIT_TC",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TD) |
S(ATR_S_WAIT_HIST) |
@@ -704,7 +742,8 @@
},
[ATR_S_WAIT_TD] = {
.name = "WAIT_TD",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TA) |
S(ATR_S_WAIT_TB) |
@@ -717,15 +756,18 @@
},
[ATR_S_WAIT_HIST] = {
.name = "WAIT_HIST",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_WAIT_TCK) |
- S(ATR_S_WAIT_T0),
+ S(ATR_S_WAIT_T0) |
+ S(ATR_S_DONE),
.action = atr_wait_tX_action,
},
[ATR_S_WAIT_TCK] = {
.name = "WAIT_TCK",
- .in_event_mask = S(ISO7816_E_RX_SINGLE),
+ .in_event_mask = S(ISO7816_E_RX_SINGLE) |
+ S(ISO7816_E_WTIME_EXP),
.out_state_mask = S(ATR_S_WAIT_TS) |
S(ATR_S_DONE),
.action = atr_wait_tX_action,
diff --git a/ccid_common/iso7816_fsm.h b/ccid_common/iso7816_fsm.h
index 9a6b24e..f2c7483 100644
--- a/ccid_common/iso7816_fsm.h
+++ b/ccid_common/iso7816_fsm.h
@@ -27,6 +27,7 @@
/* internal events between FSMs in this file */
ISO7816_E_ATR_DONE_IND, /*!< ATR Done indication from ATR child FSM */
+ ISO7816_E_ATR_ERR_IND, /*!< ATR Error indication from ATR child FSM */
ISO7816_E_TPDU_DONE_IND, /*!< TPDU Done indication from TPDU child FSM */
ISO7816_E_TPDU_CLEAR_REQ, /*!< Return TPDU FSM to TPDU_S_INIT */
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15746
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I62d47cb5e06b480941c67122f3c7d7a462ea2099
Gerrit-Change-Number: 15746
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191009/74a81e4d/attachment.htm>