<p>Ludovic Rousseau has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20903">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SIM.py: convert to Python 3 using 2to3<br><br>Change-Id: I1f972e308e14dbdbfc85892685682220a89f77fe<br>---<br>M card/SIM.py<br>1 file changed, 64 insertions(+), 64 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sim-auth refs/changes/03/20903/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/card/SIM.py b/card/SIM.py</span><br><span>index 5d97ba4..e783747 100644</span><br><span>--- a/card/SIM.py</span><br><span>+++ b/card/SIM.py</span><br><span>@@ -48,8 +48,8 @@</span><br><span> '''</span><br><span> ISO7816.__init__(self, CLA=0xA0)</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] type definition: %s' % type(self)</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] CLA definition: %s' % hex(self.CLA)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] type definition: %s' % type(self))</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] CLA definition: %s' % hex(self.CLA))</span><br><span> </span><br><span> self.caller = {</span><br><span> 'KC' : self.get_Kc,</span><br><span>@@ -121,7 +121,7 @@</span><br><span> self.coms.push( self.VERIFY(P2=pin_type, Data=PIN) )</span><br><span> else: </span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[WNG] bad parameters'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[WNG] bad parameters')</span><br><span> </span><br><span> def disable_pin(self, pin='', pin_type=1):</span><br><span> '''</span><br><span>@@ -136,7 +136,7 @@</span><br><span> self.coms.push( self.DISABLE_CHV(P2=pin_type, Data=PIN) )</span><br><span> else:</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[WNG] bad parameters'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[WNG] bad parameters')</span><br><span> </span><br><span> def unblock_pin(self, pin_type=1, unblock_pin=''):</span><br><span> '''</span><br><span>@@ -148,7 +148,7 @@</span><br><span> and set 0000 value for new PIN</span><br><span> call ISO7816 UNBLOCK_CHV method</span><br><span> '''</span><br><span style="color: hsl(0, 100%, 40%);">- print 'not correctly implemented'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('not correctly implemented')</span><br><span> return</span><br><span> #if pin_type == 1: </span><br><span> # pin_type = 0</span><br><span>@@ -160,7 +160,7 @@</span><br><span> [0x30, 0x30, 0x30, 0x30, 0xFF, 0xFF, 0xFF, 0xFF]) )</span><br><span> else:</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[WNG] bad parameters'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[WNG] bad parameters')</span><br><span> #return self.UNBLOCK_CHV(P2=pin_type)</span><br><span> </span><br><span> def parse_file(self, Data=[]):</span><br><span>@@ -231,25 +231,25 @@</span><br><span> '''</span><br><span> if len(RAND) != 16:</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[WNG] needs a 16 bytes input RAND value'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[WNG] needs a 16 bytes input RAND value')</span><br><span> return None</span><br><span> # select DF_GSM directory</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00): </span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> # run authentication</span><br><span> self.coms.push(self.INTERNAL_AUTHENTICATE(P1=0x00, P2=0x00, Data=RAND))</span><br><span> if self.coms()[2][0] != 0x9F:</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> # get authentication response</span><br><span> self.coms.push(self.GET_RESPONSE(Le=self.coms()[2][1]))</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> SRES, Kc = self.coms()[3][0:4], self.coms()[3][4:]</span><br><span> return [ SRES, Kc ]</span><br><span>@@ -265,27 +265,27 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00): </span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> # select IMSI file</span><br><span> imsi = self.select([0x6F, 0x07])</span><br><span> if self.coms()[2] != (0x90, 0x00): </span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> # and parse the received data into the IMSI structure</span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in imsi.keys() and len(imsi['Data']) == 9:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(imsi.keys()) and len(imsi['Data']) == 9:</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] International Mobile Subscriber Identity (IMSI): %s " % decode_BCD(imsi['Data'])[3:]</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] International Mobile Subscriber Identity (IMSI): %s " % decode_BCD(imsi['Data'])[3:])</span><br><span> </span><br><span> return decode_BCD(imsi['Data'])[3:]</span><br><span> </span><br><span> # if issue with the content of the DF_IMSI file</span><br><span> if self.dbg: </span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> # This contains Ciphering Key for GSM</span><br><span>@@ -297,19 +297,19 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> Kc = self.select([0x6F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in Kc.keys() and len(Kc['Data']) == 9:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(Kc.keys()) and len(Kc['Data']) == 9:</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Ciphering Key (Kc): %s" % b2a_hex(byteToString(Kc['Data'][0:8]))</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Ciphering Key Sequence Number (n): %s " % Kc['Data'][8]</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Ciphering Key (Kc): %s" % b2a_hex(byteToString(Kc['Data'][0:8])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Ciphering Key Sequence Number (n): %s " % Kc['Data'][8])</span><br><span> return Kc['Data']</span><br><span> else:</span><br><span> return None</span><br><span>@@ -327,30 +327,30 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> loci = self.select([0x6F, 0x7E])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in loci.keys() and len(loci['Data']) == 11:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(loci.keys()) and len(loci['Data']) == 11:</span><br><span> loci = loci['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Temporary Mobile Subscriber Identity (TMSI): %s" % b2a_hex(byteToString(loci[0:4]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Temporary Mobile Subscriber Identity (TMSI): %s" % b2a_hex(byteToString(loci[0:4])))</span><br><span> LAI = loci[4:9]</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Location Area Identity hex (LAI): %s" % b2a_hex(byteToString(LAI))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Location Area Identity hex (LAI): %s" % b2a_hex(byteToString(LAI)))</span><br><span> MCC = ((LAI[0] & 0x0f) << 8) | (LAI[0] & 0xf0) | (LAI[1] & 0x0f)</span><br><span> MNC = ((LAI[2] & 0x0f) << 8) | (LAI[2] & 0xf0) | ((LAI[1] & 0xf0) >> 4)</span><br><span> LAC = LAI[3:5]</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Mobile Country Code (MCC): %s " % format(int(hex(MCC),16),"x")</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Mobile Country Code (MNC): %s " % format(int(hex(MNC),16),"x")</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Location Area Code (LAC): %s " % b2a_hex(byteToString(LAC))</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] TMSI TIME: %s" % loci[9]</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Location Update Status: %s" % loci[10]</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Mobile Country Code (MCC): %s " % format(int(hex(MCC),16),"x"))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Mobile Country Code (MNC): %s " % format(int(hex(MNC),16),"x"))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Location Area Code (LAC): %s " % b2a_hex(byteToString(LAC)))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] TMSI TIME: %s" % loci[9])</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Location Update Status: %s" % loci[10])</span><br><span> </span><br><span> return loci</span><br><span> else:</span><br><span>@@ -365,20 +365,20 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> plmnsel = self.select([0x6F, 0x30])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in plmnsel.keys():</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(plmnsel.keys()):</span><br><span> plmnsel = plmnsel['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Stored PLMN selector:\tMCC | MNC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Stored PLMN selector:\tMCC | MNC\n")</span><br><span> index = 0</span><br><span> while len(plmnsel) > 3 and index < len(plmnsel):</span><br><span> if plmnsel[index] == 0xFF and plmnsel[index+1] == 0xFF and plmnsel[index+2] == 0xFF:</span><br><span>@@ -388,9 +388,9 @@</span><br><span> MNC = ((plmnsel[index+2] & 0x0f) << 8) | (plmnsel[index+2] & 0xf0) | ((plmnsel[index+1] & 0xf0) >> 4)</span><br><span> if (MNC & 0x000f) == 0x000f:</span><br><span> MNC = MNC >> 4</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] \t\t\t\t%03x %02x" %(MCC, MNC)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] \t\t\t\t%03x %02x" %(MCC, MNC))</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] \t\t\t\t%03x %03x" %(MCC, MNC)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] \t\t\t\t%03x %03x" %(MCC, MNC))</span><br><span> index +=3</span><br><span> </span><br><span> return plmnsel</span><br><span>@@ -406,25 +406,25 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> hpplmn = self.select([0x6F, 0x31])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in hpplmn.keys() and len(hpplmn['Data']) == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(hpplmn.keys()) and len(hpplmn['Data']) == 1:</span><br><span> hpplmn = hpplmn['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span> if hpplmn[0] < 9:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Higher Priority PLMN search period %s min" % hpplmn[0]</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Higher Priority PLMN search period %s min" % hpplmn[0])</span><br><span> else:</span><br><span> hpplmn_val = list(str(hpplmn[0]))</span><br><span> interval = (16 * int(hpplmn_val[0])) + int(hpplmn_val[1])</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Higher Priority PLMN search period %s min" % interval</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Higher Priority PLMN search period %s min" % interval)</span><br><span> </span><br><span> return hpplmn</span><br><span> else:</span><br><span>@@ -438,20 +438,20 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> acc = self.select([0x6F, 0x78])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in acc.keys() and len(acc['Data']) == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(acc.keys()) and len(acc['Data']) == 2:</span><br><span> acc = acc['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Access Control Classes %s " % b2a_hex(byteToString(acc))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Access Control Classes %s " % b2a_hex(byteToString(acc)))</span><br><span> </span><br><span> return acc</span><br><span> else:</span><br><span>@@ -466,16 +466,16 @@</span><br><span> self.select([0x7F, 0x10])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> msisdn = self.select([0x6F, 0x40])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in msisdn.keys():</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(msisdn.keys()):</span><br><span> msisdns = msisdn['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span>@@ -486,11 +486,11 @@</span><br><span> TON_NPI = msisdn[rec_length + 1 : rec_length + 2][0]</span><br><span> npi = TON_NPI & 0x0F</span><br><span> ton = (TON_NPI >> 4) & 0x07</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Type of number (TON): %s " % ton</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Numbering plan identification (NPI): %s " % npi</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Type of number (TON): %s " % ton)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Numbering plan identification (NPI): %s " % npi)</span><br><span> </span><br><span> dialing_number = msisdn[rec_length + 2 : rec_length + len_bcd_number + 1]</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Dialling Number: %s " % decode_BCD(dialing_number)[:-2]</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Dialling Number: %s " % decode_BCD(dialing_number)[:-2])</span><br><span> </span><br><span> return msisdns</span><br><span> else:</span><br><span>@@ -506,16 +506,16 @@</span><br><span> self.select([0x7F, 0x10])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> smsp = self.select([0x6F, 0x42])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in smsp.keys():</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(smsp.keys()):</span><br><span> smsps = smsp['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span>@@ -523,7 +523,7 @@</span><br><span> rec_length = len(smsp) - 28</span><br><span> rec_len = smsp[rec_length+13]</span><br><span> service_center_address = decode_BCD(smsp[rec_length+15:rec_length+rec_len + 14])[:-2]</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] TP-Service Centre Address: %s " % service_center_address</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] TP-Service Centre Address: %s " % service_center_address)</span><br><span> </span><br><span> return smsps</span><br><span> else:</span><br><span>@@ -537,20 +537,20 @@</span><br><span> self.select([0x7F, 0x20])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span> fplmn = self.select([0x6F, 0x7b])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in fplmn.keys() and len(fplmn['Data']) == 12:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(fplmn.keys()) and len(fplmn['Data']) == 12:</span><br><span> fplmn = fplmn['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] Stored FPLMN selector:\tMCC | MNC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] Stored FPLMN selector:\tMCC | MNC\n")</span><br><span> index = 0</span><br><span> while len(fplmn) > 3 and index < len(fplmn):</span><br><span> if fplmn[index] == 0xFF and fplmn[index+1] == 0xFF and fplmn[index+2] == 0xFF:</span><br><span>@@ -560,9 +560,9 @@</span><br><span> MNC = ((fplmn[index+2] & 0x0f) << 8) | (fplmn[index+2] & 0xf0) | ((fplmn[index+1] & 0xf0) >> 4)</span><br><span> if (MNC & 0x000f) == 0x000f:</span><br><span> MNC = MNC >> 4</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] \t\t\t\t%03x %02x" %(MCC, MNC)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] \t\t\t\t%03x %02x" %(MCC, MNC))</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] \t\t\t\t%03x %03x" %(MCC, MNC)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] \t\t\t\t%03x %03x" %(MCC, MNC))</span><br><span> index +=3</span><br><span> </span><br><span> </span><br><span>@@ -578,14 +578,14 @@</span><br><span> iccid = self.select([0x2F, 0xE2])</span><br><span> if self.coms()[2] != (0x90, 0x00):</span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print '[DBG] %s' % self.coms()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('[DBG] %s' % self.coms())</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if 'Data' in iccid.keys() and len(iccid['Data']) == 10:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'Data' in list(iccid.keys()) and len(iccid['Data']) == 10:</span><br><span> iccid = iccid['Data']</span><br><span> </span><br><span> if self.dbg:</span><br><span style="color: hsl(0, 100%, 40%);">- print "[DBG] identification (ICCID): %s" % decode_BCD(iccid)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("[DBG] identification (ICCID): %s" % decode_BCD(iccid))</span><br><span> </span><br><span> return iccid</span><br><span> else:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20903">change 20903</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/osmo-sim-auth/+/20903"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sim-auth </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1f972e308e14dbdbfc85892685682220a89f77fe </div>
<div style="display:none"> Gerrit-Change-Number: 20903 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Ludovic Rousseau <ludovic.rousseau+osmocom@free.fr> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>