public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-28 00:08:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

pySim-shell: Migrate PySimApp.iccid to RuntimeState.identity['ICCID']

Browse Source 
In the previous patch, we've introduced a new 'identities' dict as part
of the runtime state.  Let's migrate our ICCID storage into it for
consistency.

Change-Id: Ibdcf9a7c4e7e445201640bce33b768bcc4460db1
This commit is contained in:
Harald Welte
2024-05-25 10:40:43 +02:00
parent f47433863e
commit 7f6102365c
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pySim-shell.py
View File

@@ -160,9 +160,9 @@ Online manual available at https://downloads.osmocom.org/docs/pysim/master/html/
try: try:
self.lchan.select('MF/EF.ICCID', self) self.lchan.select('MF/EF.ICCID', self)
self.iccid = dec_iccid(self.lchan.read_binary()[0]) rs.identity['ICCID'] = dec_iccid(self.lchan.read_binary()[0])
except: except:
self.iccid = None rs.identity['ICCID'] = None
self.lchan.select('MF', self) self.lchan.select('MF', self)
rc = True rc = True
@@ -741,16 +741,14 @@ Currently only ADM1 is supported."""
# use specified ADM-PIN # use specified ADM-PIN
pin_adm = sanitize_pin_adm(opts.ADM1) pin_adm = sanitize_pin_adm(opts.ADM1)
else: else:
iccid = self._cmd.rs.identity['ICCID']
# try to find an ADM-PIN if none is specified # try to find an ADM-PIN if none is specified
result = card_key_provider_get_field( result = card_key_provider_get_field('ADM1', key='ICCID', value=iccid)
'ADM1', key='ICCID', value=self._cmd.iccid)
pin_adm = sanitize_pin_adm(result) pin_adm = sanitize_pin_adm(result)
if pin_adm: if pin_adm:
self._cmd.poutput( self._cmd.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, iccid))
"found ADM-PIN '%s' for ICCID '%s'" % (result, self._cmd.iccid))
else: else:
raise ValueError( raise ValueError("cannot find ADM-PIN for ICCID '%s'" % (iccid))
"cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid))
if pin_adm: if pin_adm:
self._cmd.lchan.scc.verify_chv(self._cmd.card._adm_chv_num, h2b(pin_adm)) self._cmd.lchan.scc.verify_chv(self._cmd.card._adm_chv_num, h2b(pin_adm))
@@ -762,7 +760,7 @@ Currently only ADM1 is supported."""
self._cmd.poutput("Card info:") self._cmd.poutput("Card info:")
self._cmd.poutput(" Name: %s" % self._cmd.card.name) self._cmd.poutput(" Name: %s" % self._cmd.card.name)
self._cmd.poutput(" ATR: %s" % self._cmd.rs.identity['ATR']) self._cmd.poutput(" ATR: %s" % self._cmd.rs.identity['ATR'])
self._cmd.poutput(" ICCID: %s" % self._cmd.iccid) self._cmd.poutput(" ICCID: %s" % self._cmd.rs.identity['ICCID'])
self._cmd.poutput(" Class-Byte: %s" % self._cmd.lchan.scc.cla_byte) self._cmd.poutput(" Class-Byte: %s" % self._cmd.lchan.scc.cla_byte)
self._cmd.poutput(" Select-Ctrl: %s" % self._cmd.lchan.scc.sel_ctrl) self._cmd.poutput(" Select-Ctrl: %s" % self._cmd.lchan.scc.sel_ctrl)
self._cmd.poutput(" AIDs:") self._cmd.poutput(" AIDs:")
@@ -799,15 +797,13 @@ class Iso7816Commands(CommandSet):
if str(code).upper() not in auto: if str(code).upper() not in auto:
return sanitize_pin_adm(code) return sanitize_pin_adm(code)
result = card_key_provider_get_field( iccid = self._cmd.rs.identity['ICCID']
str(code), key='ICCID', value=self._cmd.iccid) result = card_key_provider_get_field(str(code), key='ICCID', value=iccid)
result = sanitize_pin_adm(result) result = sanitize_pin_adm(result)
if result: if result:
self._cmd.poutput("found %s '%s' for ICCID '%s'" % self._cmd.poutput("found %s '%s' for ICCID '%s'" % (code.upper(), result, iccid))
(code.upper(), result, self._cmd.iccid))
else: else:
self._cmd.poutput("cannot find %s for ICCID '%s'" % self._cmd.poutput("cannot find %s for ICCID '%s'" % (code.upper(), iccid))
(code.upper(), self._cmd.iccid))
return result return result
verify_chv_parser = argparse.ArgumentParser() verify_chv_parser = argparse.ArgumentParser()