<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16691">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: Add support for sysmo-isim-sja2<br><br>The sysmo-isim-sja2 cards are not yet supported by pysim. Lets add<br>support for writing KI and OPC in ADF.USIM and ADF.ISIM as well as the<br>remaining common simcard parameters.<br><br>Related: SYS#4466<br>Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf<br>---<br>M pySim/cards.py<br>M pySim/commands.py<br>A pysim-testdata/sysmoISIM-SJA2.data<br>A pysim-testdata/sysmoISIM-SJA2.ok<br>4 files changed, 199 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/16691/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 758ec0e..9174ad5 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -144,6 +144,30 @@</span><br><span> data, sw = self._scc.update_binary(EF['SPN'], rpad(content, 32))</span><br><span> return sw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Read the (full) AID for either ISIM or USIM application</span><br><span style="color: hsl(120, 100%, 40%);">+ def read_aid(self, isim = False):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # First (known) halves of the AID</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_usim = "a0000000871002"</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_isim = "a0000000871004"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Select which one to look for</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim:</span><br><span style="color: hsl(120, 100%, 40%);">+ aid = aid_isim</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ aid = aid_usim</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find out how many records the EF.DIR has, then go through</span><br><span style="color: hsl(120, 100%, 40%);">+ # all records and try to find the AID we are looking for</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_record_count = self._scc.record_count(['2F00'])</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in range(0, aid_record_count):</span><br><span style="color: hsl(120, 100%, 40%);">+ record = self._scc.read_record(['2F00'], i + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if aid in record[0]:</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_len = int(record[0][6:8], 16)</span><br><span style="color: hsl(120, 100%, 40%);">+ return record[0][8:8 + aid_len * 2]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> class _MagicSimBase(Card):</span><br><span> """</span><br><span>@@ -911,10 +935,120 @@</span><br><span> return</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class SysmoISIMSJA2(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmocom sysmoISIM-SJA2</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ name = 'sysmoISIM-SJA2'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, ssc):</span><br><span style="color: hsl(120, 100%, 40%);">+ super(SysmoISIMSJA2, self).__init__(ssc)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.cla_byte = "00"</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.sel_ctrl = "0004" #request an FCP</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @classmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def autodetect(kls, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Try card model #1</span><br><span style="color: hsl(120, 100%, 40%);">+ atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9"</span><br><span style="color: hsl(120, 100%, 40%);">+ if scc.get_atr() == toBytes(atr):</span><br><span style="color: hsl(120, 100%, 40%);">+ return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Try card model #2</span><br><span style="color: hsl(120, 100%, 40%);">+ atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2"</span><br><span style="color: hsl(120, 100%, 40%);">+ if scc.get_atr() == toBytes(atr):</span><br><span style="color: hsl(120, 100%, 40%);">+ return kls(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ except:</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def program(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ # authenticate as ADM using default key (written on the card..)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not p['pin_adm']:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.verify_chv(0x0A, h2b(p['pin_adm']))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # This type of card does not allow to reprogram the ICCID.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Reprogramming the ICCID would mess up the card os software</span><br><span style="color: hsl(120, 100%, 40%);">+ # license management, so the ICCID must be kept at its factory</span><br><span style="color: hsl(120, 100%, 40%);">+ # setting!</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('iccid'):</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Warning: Programming of the ICCID is not implemented for this type of card.")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # select DF_GSM</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_file(['7f20'])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # write EF.IMSI</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('imsi'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('6f07', enc_imsi(p['imsi']))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.PLMNsel</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_plmnsel(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming PLMNsel failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.PLMNwAcT</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_plmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming PLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.OPLMNwAcT</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_oplmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming OPLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.AD</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_ad(p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming AD failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.SMSP</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('smsp'):</span><br><span style="color: hsl(120, 100%, 40%);">+ r = self._scc.select_file(['3f00', '7f10'])</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is</span><br><span style="color: hsl(120, 100%, 40%);">+ # hard linked to EF-USIM_AUTH_KEY)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_file(['3f00'])</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_file(['a515'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('ki'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('6f20', p['ki'], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('opc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('6f20', p['opc'], 17)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # update EF-USIM_AUTH_KEY in ADF.ISIM</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_file(['3f00'])</span><br><span style="color: hsl(120, 100%, 40%);">+ aid = self.read_aid(isim = True)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('ki'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('af20', p['ki'], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('opc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('af20', p['opc'], 17)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # update EF-USIM_AUTH_KEY in ADF.USIM</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_file(['3f00'])</span><br><span style="color: hsl(120, 100%, 40%);">+ aid = self.read_aid()</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('ki'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('af20', p['ki'], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('opc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.update_binary('af20', p['opc'], 17)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def erase(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # In order for autodetection ...</span><br><span> _cards_classes = [ FakeMagicSim, SuperSim, MagicSim, GrcardSim,</span><br><span> SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1,</span><br><span style="color: hsl(0, 100%, 40%);">- FairwavesSIM, OpenCellsSim, WavemobileSim ]</span><br><span style="color: hsl(120, 100%, 40%);">+ FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2 ]</span><br><span> </span><br><span> def card_autodetect(scc):</span><br><span> for kls in _cards_classes:</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index f2bdf7a..385cacf 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -107,6 +107,10 @@</span><br><span> rv.append(data)</span><br><span> return rv</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def select_adf(self, aid):</span><br><span style="color: hsl(120, 100%, 40%);">+ aidlen = ("0" + format(len(aid)/2, 'x'))[-2:]</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def read_binary(self, ef, length=None, offset=0):</span><br><span> if not hasattr(type(ef), '__iter__'):</span><br><span> ef = [ef]</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.data b/pysim-testdata/sysmoISIM-SJA2.data</span><br><span>new file mode 100644</span><br><span>index 0000000..4b45a06</span><br><span>--- /dev/null</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.data</span><br><span>@@ -0,0 +1,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+MCC=001</span><br><span style="color: hsl(120, 100%, 40%);">+MNC=01</span><br><span style="color: hsl(120, 100%, 40%);">+ICCID=1122334455667788990</span><br><span style="color: hsl(120, 100%, 40%);">+KI=AABBCCDDEEFFAABBCCDDEEFFAABBCCDD</span><br><span style="color: hsl(120, 100%, 40%);">+OPC=12345678901234567890123456789012</span><br><span style="color: hsl(120, 100%, 40%);">+IMSI=001010000000102</span><br><span style="color: hsl(120, 100%, 40%);">+ADM=72273953</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>new file mode 100644</span><br><span>index 0000000..fb191e0</span><br><span>--- /dev/null</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -0,0 +1,53 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=0) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+ICCID: 8988211900000000004</span><br><span style="color: hsl(120, 100%, 40%);">+IMSI: 001010000000102</span><br><span style="color: hsl(120, 100%, 40%);">+SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OPLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HPLMNAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffff0000 # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ACC: 0001</span><br><span style="color: hsl(120, 100%, 40%);">+MSISDN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Done !</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16691">change 16691</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/16691"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf </div>
<div style="display:none"> Gerrit-Change-Number: 16691 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>