laforge submitted this change.

View Change



3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified
cards: all UICC should use sel_ctrl="0400" and SIM "0000"

Hence move this from the derived classes into the respective base
classes SimCardBase and UiccCardBase

Change-Id: Iad197c2b560c5ea05c54a122144361de5742aafd
---
M pySim/cards.py
M pySim/legacy/cards.py
2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pySim/cards.py b/pySim/cards.py
index 772ea52..c6a68fc 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -86,6 +86,7 @@
def __init__(self, scc: LinkBase):
super(SimCardBase, self).__init__(scc)
self._scc.cla_byte = "A0"
+ self._scc.sel_ctrl = "0000"

def probe(self) -> bool:
df_gsm = DF_GSM()
@@ -98,6 +99,7 @@
def __init__(self, scc: LinkBase):
super(UiccCardBase, self).__init__(scc)
self._scc.cla_byte = "00"
+ self._scc.sel_ctrl = "0004" # request an FCP
# See also: ETSI TS 102 221, Table 9.3
self._adm_chv_num = 0xA0

diff --git a/pySim/legacy/cards.py b/pySim/legacy/cards.py
index d4e5862..e64b5c3 100644
--- a/pySim/legacy/cards.py
+++ b/pySim/legacy/cards.py
@@ -893,7 +893,6 @@

def __init__(self, ssc):
super(SysmoUSIMSJS1, self).__init__(ssc)
- self._scc.sel_ctrl = "0004" # request an FCP

@classmethod
def autodetect(kls, scc):
@@ -1205,7 +1204,6 @@
def __init__(self, ssc):
super(WavemobileSim, self).__init__(ssc)
self._adm_chv_num = 0x0A
- self._scc.sel_ctrl = "0004" # request an FCP

@classmethod
def autodetect(kls, scc):
@@ -1297,10 +1295,6 @@

name = 'sysmoISIM-SJA2'

- def __init__(self, ssc):
- super(SysmoISIMSJA2, self).__init__(ssc)
- self._scc.sel_ctrl = "0004" # request an FCP
-
@classmethod
def autodetect(kls, scc):
try:

To view, visit change 33697. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iad197c2b560c5ea05c54a122144361de5742aafd
Gerrit-Change-Number: 33697
Gerrit-PatchSet: 5
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged