<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15501">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">test please ignore<br><br>Change-Id: Ib757b1433c075c635fe43542103acae2167a1a15<br>---<br>M pySim/cards.py<br>1 file changed, 116 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/15501/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 ec001ab..e1557c0 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -145,6 +145,107 @@</span><br><span> return sw</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class _GenericSimBase(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ A comfortable wrapper for the Card class. This class provides methods</span><br><span style="color: hsl(120, 100%, 40%);">+ that just accept just the parameter array. All further decisions,</span><br><span style="color: hsl(120, 100%, 40%);">+ parameter checking, status word checking are then done in this class.</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%);">+ def __check_sw(self, par, sw):</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming %s failed with code %s" % (par, sw))</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Safely get a parameter from the parameter array. Ensure that it</span><br><span style="color: hsl(120, 100%, 40%);">+ # exists and that it is not empty. Also ensure that it is always</span><br><span style="color: hsl(120, 100%, 40%);">+ # a string so that we know what we are working with.</span><br><span style="color: hsl(120, 100%, 40%);">+ def __get_p(self, p, p_name):</span><br><span style="color: hsl(120, 100%, 40%);">+ p_val = p.get(p_name, None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if p_val == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+ return str(p_val).strip()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __get_mcc_mnc(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = self.__get_p(p, 'mcc')</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = self.__get_p(p, 'mnc')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # If MCC is missing, try to obtain it from the IMSI</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi = self.__get_p(p, 'imsi')</span><br><span style="color: hsl(120, 100%, 40%);">+ if imsi == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return (None, None)</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = mcc_from_imsi(imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # If MNC is missing, try to obtain it from the IMSI</span><br><span style="color: hsl(120, 100%, 40%);">+ if mnc == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi = self.__get_p(p, 'imsi')</span><br><span style="color: hsl(120, 100%, 40%);">+ if imsi == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return (None, None)</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = mnc_from_imsi(imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcc, mnc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_imsi(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi = self.__get_p(p, 'imsi')</span><br><span style="color: hsl(120, 100%, 40%);">+ if imsi != None:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_imsi(imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('imsi',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_acc(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('acc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_acc(p['acc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('ACC',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_plmnsel(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc, mnc = self.__get_mcc_mnc(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc and mnc:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_plmnsel(int(mcc), int(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('PLMNsel',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_hplmn_act(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc, mnc = self.__get_mcc_mnc(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc and mnc:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_hplmn_act(int(mcc), int(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('HPLMNwAcT',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_oplmn_act(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc, mnc = self.__get_mcc_mnc(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc and mnc:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_oplmn_act(int(mcc), int(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('OPLMNwAcT',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_plmn_act(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc, mnc = self.__get_mcc_mnc(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc and mnc:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_plmn_act(int(mcc), int(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('PLMNwAcT',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_smsp(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('smsp'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_smsp(p['smsp'])</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('SMSP',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_ad(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc, mnc = self.__get_mcc_mnc(p);</span><br><span style="color: hsl(120, 100%, 40%);">+ if mcc and mnc:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_ad(int(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('AD',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def p_update_smsp(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ smsp = self.__get_p(p, 'smsp')</span><br><span style="color: hsl(120, 100%, 40%);">+ if smsp:</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_smsp(smsp)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.__check_sw('SMSP',sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class _MagicSimBase(Card):</span><br><span> """</span><br><span> Theses cards uses several record based EFs to store the provider infos,</span><br><span>@@ -542,7 +643,7 @@</span><br><span> def erase(self):</span><br><span> return</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class SysmoUSIMSJS1(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class SysmoUSIMSJS1(_GenericSimBase):</span><br><span> """</span><br><span> sysmocom sysmoUSIM-SJS1</span><br><span> """</span><br><span>@@ -589,33 +690,21 @@</span><br><span> data, sw = self._scc.update_binary('00F7', content)</span><br><span> </span><br><span> # write EF.IMSI</span><br><span style="color: hsl(0, 100%, 40%);">- data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi']))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_imsi(p)</span><br><span> </span><br><span> # EF.PLMNsel</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_plmnsel(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming PLMNsel failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_plmnsel(p)</span><br><span> </span><br><span> # EF.PLMNwAcT</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_plmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming PLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_plmn_act(p)</span><br><span> </span><br><span> # EF.OPLMNwAcT</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_oplmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming OPLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_oplmn_act(p)</span><br><span> </span><br><span> # EF.AD</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_ad(p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming AD failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_ad(p)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # EF.SMSP</span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.SMSP (propritary method?, why different than the others?)</span><br><span> if p.get('smsp'):</span><br><span> r = self._scc.select_file(['3f00', '7f10'])</span><br><span> data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True)</span><br><span>@@ -817,7 +906,7 @@</span><br><span> # write EF.IMSI</span><br><span> data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi']))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class WavemobileSim(Card):</span><br><span style="color: hsl(120, 100%, 40%);">+class WavemobileSim(_GenericSimBase):</span><br><span> """</span><br><span> WavemobileSim</span><br><span> </span><br><span>@@ -864,46 +953,25 @@</span><br><span> print("Warning: Programming of the OPc is not implemented for this type of card.")</span><br><span> </span><br><span> # EF.SMSP</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('smsp'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_smsp(p['smsp'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming SMSP failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_smsp(p)</span><br><span> </span><br><span> # EF.IMSI</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('imsi'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_imsi(p['imsi'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming IMSI failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_imsi(p)</span><br><span> </span><br><span> # EF.ACC</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('acc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_acc(p['acc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming ACC failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_acc(p)</span><br><span> </span><br><span> # EF.PLMNsel</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_plmnsel(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming PLMNsel failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_plmnsel(p)</span><br><span> </span><br><span> # EF.PLMNwAcT</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_plmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming PLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_plmn_act(p)</span><br><span> </span><br><span> # EF.OPLMNwAcT</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_oplmn_act(p['mcc'], p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming OPLMNwAcT failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_oplmn_act(p)</span><br><span> </span><br><span> # EF.AD</span><br><span style="color: hsl(0, 100%, 40%);">- if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(0, 100%, 40%);">- sw = self.update_ad(p['mnc'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("Programming AD failed with code %s"%sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.p_update_ad(p)</span><br><span> </span><br><span> return None</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15501">change 15501</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/+/15501"/><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: Ib757b1433c075c635fe43542103acae2167a1a15 </div>
<div style="display:none"> Gerrit-Change-Number: 15501 </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>