jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42793?usp=email )
Change subject: CCID: Integrate SIMTRACE emulation into test cases ...................................................................... CCID: Integrate SIMTRACE emulation into test cases This integration allows to add tests that use SIMtrace hardware instead of a physical SIM. These tests can be used to test handling of invalid behaviors, such as invalid responses or timeouts. The number of slots (mp_use_slot_count) are reduced to 7, so that the 8th slot can be used with a SIMtrace for subsequent tests. Change-Id: Ia27dd5198edb188bc73196ac3fbd6d56ba75812e --- M ccid/CCID_Tests.ttcn M ccid/gen_links.sh 2 files changed, 132 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/42793/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index 107d00d..0715fba 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -3,6 +3,7 @@ /* TTCN-3 tests for USB CCID (Chip Card Interface Device) * * (C) 2018-2019 by Harald Welte <[email protected]> + * (C) 2026 by Andreas Eversberg <[email protected]> */ import from General_Types all; @@ -16,18 +17,33 @@ import from CCID_Templates all; import from CCID_Emulation all; +import from SIMTRACE_Types all; +import from SIMTRACE_Templates all; +import from SIMTRACE_Emulation all; + modulepar { USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; - integer mp_use_slot_count := 8; + USB_Device_Match mp_cardem_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '60e3'H } }; + integer mp_use_slot_count := 7; + integer mp_simtrace_slot := 7; boolean mp_test_power_off := true; boolean mp_test_set_params := false; boolean mp_quirk_resetpar_returns_slotsts := false; } + /* global test component; manages CCID device */ type component Test_CT { var CCID_Emulation_CT vc_CCID; port USB_PT USB; - var Slot_CT vc_SLOT[NR_SLOTS]; + var CardemSlot_CT vc_SLOT[NR_SLOTS]; + var ST_Emulation_CT vc_cardem_ref[NR_SLOTS]; + private var boolean Cardem_In_Use := false; +}; + +type component CardemSlot_CT extends Slot_CT { + var ST_Emulation_CT vc_Cardem := null; + port ST_USER_PT ST; + port ST_USER_PT ST_IRQ; }; /* maximum number of slots we are supporting in the test suite */ @@ -93,28 +109,46 @@ } }; -type function void_fn() runs on Slot_CT; +type function void_fn() runs on CardemSlot_CT; -/* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ -private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { +/* first function inside CardemSlot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ +private function f_handler_init(void_fn fn, integer slot_nr, ST_Emulation_CT v_cardem_ref) runs on CardemSlot_CT { g_slot_nr := slot_nr; - CCID.receive(CCID_Emulation_Event:{up_down:=CCID_EVENT_UP}); + vc_Cardem := v_cardem_ref; g_Tguard.start; activate(as_Tguard()); + CCID.receive(CCID_Emulation_Event:{up_down:=CCID_EVENT_UP}); fn.apply(); } /* start a single slot handler */ -private function f_start_handler(void_fn fn, integer slot_nr) runs on Test_CT +private function f_start_handler(void_fn fn, integer slot_nr, boolean use_cardem := false) runs on Test_CT { - var Slot_CT vc; + var ST_Emulation_CT vc_Cardem := null; - vc_SLOT[slot_nr] := Slot_CT.create("Slot" & int2str(slot_nr)); + vc_SLOT[slot_nr] := CardemSlot_CT.create("Slot" & int2str(slot_nr)); connect(vc_SLOT[slot_nr]:CCID, vc_CCID:SLOT[slot_nr]); - vc_SLOT[slot_nr].start(f_handler_init(fn, slot_nr)); + + if (use_cardem) { + if (Cardem_In_Use) { + setverdict(fail, "Only one CCID slot handler can use Cardem."); + mtc.stop; + } + vc_Cardem := ST_Emulation_CT.create("Cardem"); + map(vc_Cardem:USB, system:USB); + connect(vc_Cardem:INOUT, vc_SLOT[slot_nr]:ST); + connect(vc_Cardem:IRQ, vc_SLOT[slot_nr]:ST_IRQ); + Cardem_In_Use := true; + } + + vc_cardem_ref[slot_nr] := vc_Cardem; + + vc_SLOT[slot_nr].start(f_handler_init(fn, slot_nr, vc_Cardem)); + } +/* start a single Cardem slot handler */ private function f_wait_handlers_complete() runs on Test_CT { var integer i; @@ -127,9 +161,19 @@ } private function f_start_and_wait() runs on Test_CT { - /* start CCID_Emulation last, it will trigger all the per-slot components */ - var CCID_Emulation_Params cep := { usb_dev_match := mp_usb_dev_match }; - vc_CCID.start(CCID_Emulation.main(cep)); + var integer i; + + /* start CCID_Emulation and Cardem_Emulation last, it will trigger all the per-slot components */ + var CCID_Emulation_Params ccidp := { usb_dev_match := mp_usb_dev_match }; + var USB_IF_Params cardemp := { usb_dev_match := mp_cardem_usb_dev_match, usb_if_nr := 0 }; + vc_CCID.start(CCID_Emulation.main(ccidp)); + for (i := 0; i < NR_SLOTS; i := i+1) { + if (vc_SLOT[i] != null) { + if (vc_cardem_ref[i] != null) { + vc_cardem_ref[i].start(SIMTRACE_Emulation.main(cardemp)); + } + } + } f_wait_handlers_complete(); } @@ -142,7 +186,81 @@ } } +altstep as_cardem_any() runs on CardemSlot_CT { + var SIMTRACE_PDU pdu; + [] ST.receive(SIMTRACE_PDU:?) -> value pdu { + setverdict(fail, "Received unexpected CCID ", pdu); + self.stop; + } + [] ST.receive { + setverdict(fail, "Received unexpected non-CCID"); + self.stop; + } +} +/* transceive a Cardem command (expect 'rx' on IN) */ +function f_cardem_receive(template (present) SIMTRACE_PDU exp_rx) +runs on CardemSlot_CT return SIMTRACE_PDU { + var SIMTRACE_PDU pdu; + + alt { + [] ST.receive(exp_rx) -> value pdu { + return pdu; + } + [] as_cardem_any(); + } + return pdu; +} + +function f_cardem_transmit(template (value) SIMTRACE_PDU tx) +runs on CardemSlot_CT { + ST.send(tx); +} + +altstep as_cardem_manager() runs on CardemSlot_CT { + var SIMTRACE_PDU pdu; + + [] ST.receive(tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) { + log("Got Config."); + repeat; + } + [] ST_IRQ.receive(tr_SIMTRACE_MODEM_STATUS()) { + log("Got Status."); + repeat; + } + [] ST.receive(tr_SIMTRACE_CEMU_PTS(?, ?)) { + log("Got PTS info."); + repeat; + } +} + +function f_cardem_manager() runs on CardemSlot_CT { + if (vc_Cardem == null) { + setverdict(fail, "Please enable Cardem support first."); + mtc.stop; + } + + activate(as_cardem_manager()); + + f_cardem_transmit(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true))); + f_cardem_transmit(ts_SIMTRACE_MODEM_SIM_SELECT(SIM_SELECT_REMOTE)); + f_cardem_transmit(ts_SIMTRACE_CEMU_SET_ATR('3b00'O)); + f_cardem_transmit(ts_SIMTRACE_CEMU_CARDINSERT(1)); + f_cardem_transmit(ts_SIMTRACE_MODEM_RESET(MODEM_RESET_PULSE, 300)); + f_cardem_transmit(ts_SIMTRACE_CEMU_SET_ATR('3b9f96801f878031e073fe211b674a4c753034054ba9'O)); + f_sleep(0.2); +} + +private function f_ccid_receive(template (present) CCID_PDU pdu_exp) runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu_rx; + alt { + [] CCID.receive(pdu_exp) -> value pdu_rx { + } + [] as_ccid_any(); + } + + return pdu_rx; +} /*********************************************************************** * Test behavior regarding valid situations diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh index dac7ffe..2f6f0ac 100755 --- a/ccid/gen_links.sh +++ b/ccid/gen_links.sh @@ -16,6 +16,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " gen_links $DIR $FILES gen_links_finish -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia27dd5198edb188bc73196ac3fbd6d56ba75812e Gerrit-Change-Number: 42793 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <[email protected]>
