Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 )

Change subject: handle card ejection during poweron/wait for ATR
......................................................................

handle card ejection during poweron/wait for ATR

Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e
---
M ccid_common/iso7816_fsm.c
1 file changed, 26 insertions(+), 12 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index 2796d30..307dac3 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -128,6 +128,17 @@
 	0xf0, 0x70, 0xb0, 0x30, 0xd0, 0x50, 0x90, 0x10, 0xe0, 0x60, 0xa0, 0x20, 0xc0, 0x40, 0x80, 0x00,
 };
 
+struct atr_fsm_priv {
+	uint8_t hist_len;	/*!< store the number of expected historical bytes */
+	uint8_t y;		/*!< last mask of the upcoming TA, TB, TC, TD interface bytes */
+	uint8_t i;		/*!< interface byte subgroup number */
+	struct msgb *atr;	/*!< ATR data */
+	uint8_t computed_checksum;
+	uint16_t protocol_support;
+};
+
+static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi);
+
 /***********************************************************************
  * ISO7816-3 Main FSM
  ***********************************************************************/
@@ -376,11 +387,15 @@
 static void iso7816_3_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
 	OSMO_ASSERT(fi->fsm == &iso7816_3_fsm);
+	struct iso7816_3_priv *ip = get_iso7816_3_priv(fi);
+	struct atr_fsm_priv *atp = get_atr_fsm_priv(ip->atr_fi);
 
 	switch (event) {
 	case ISO7816_E_HW_ERR_IND:
 	case ISO7816_E_CARD_REMOVAL:
 		/* FIXME: power off? */
+		if(fi->state == ISO7816_S_WAIT_ATR || fi->state == ISO7816_S_IN_ATR)
+			ip->user_cb(fi, ISO7816_E_ATR_ERR_IND, 0, atp->atr);
 		osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0);
 		break;
 	case ISO7816_E_POWER_DN_IND:
@@ -541,14 +556,13 @@
  * ATR FSM
  ***********************************************************************/
 
-struct atr_fsm_priv {
-	uint8_t hist_len;	/*!< store the number of expected historical bytes */
-	uint8_t y;		/*!< last mask of the upcoming TA, TB, TC, TD interface bytes */
-	uint8_t i;		/*!< interface byte subgroup number */
-	struct msgb *atr;	/*!< ATR data */
-	uint8_t computed_checksum;
-	uint16_t protocol_support;
-};
+/* type-safe method to obtain atr_fsm_priv from fi */
+static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi)
+{
+	OSMO_ASSERT(fi);
+	OSMO_ASSERT(fi->fsm == &atr_fsm);
+	return (struct atr_fsm_priv *) fi->priv;
+}
 
 /* obtain the [software] guard time in milli-seconds from the atr fsm_inst */
 static uint32_t atr_fi_gt_ms(struct osmo_fsm_inst *fi)
@@ -579,7 +593,7 @@
 /* append a single byte to the ATR */
 static int atr_append_byte(struct osmo_fsm_inst *fi, uint8_t byte)
 {
-	struct atr_fsm_priv *atp = fi->priv;
+	struct atr_fsm_priv *atp = get_atr_fsm_priv(fi);
 
 	if (!msgb_tailroom(atp->atr)) {
 		LOGPFSML(fi, LOGL_ERROR, "ATR overflow !?!");
@@ -592,7 +606,7 @@
 
 static void atr_wait_ts_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)
 {
-	struct atr_fsm_priv *atp = fi->priv;
+	struct atr_fsm_priv *atp = get_atr_fsm_priv(fi);
 
 	/* reset state to its initial value */
 	atp->hist_len = 0;
@@ -608,7 +622,7 @@
 
 static void atr_wait_ts_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
-	struct atr_fsm_priv *atp = fi->priv;
+	struct atr_fsm_priv *atp = get_atr_fsm_priv(fi);
 	struct osmo_fsm_inst *parent_fi = fi->proc.parent;
 	struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);
 	uint8_t byte;
@@ -654,7 +668,7 @@
 
 static void atr_wait_tX_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
-	struct atr_fsm_priv *atp = fi->priv;
+	struct atr_fsm_priv *atp = get_atr_fsm_priv(fi);
 	uint32_t guard_time_ms = atr_fi_gt_ms(fi);
 	uint8_t byte;
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468
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: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e
Gerrit-Change-Number: 19468
Gerrit-PatchSet: 5
Gerrit-Owner: Hoernchen <ewild at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200731/1a77f922/attachment.htm>