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

cards: sysmo-isim-sja2: make sure an ADF is present in EF.DIR before selecting it

Browse Source 
sysmo-isim-sja2 may come in different configurations, so some may
intentionally lack ADF.USIM or ADF.ISIM. Since select_adf_by_aid() may
raise an exception when selecting a non existent file we should make
sure that the ADF we intend to select is indeed present. A reliable way
to do this is to check if the application is registered in EF.DIR.

Change-Id: Icf6f6b36f246398af408ec432d493fe3f22963dd
This commit is contained in:
Philipp Maier
2023-02-10 18:23:36 +01:00
parent 865eea68c3
commit 8490240ce6
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pySim/cards.py
View File

@@ -307,6 +307,15 @@ class SimCard:
return aid_known return aid_known
return None return None
def adf_present(self, adf="usim") -> bool:
"""Check if the AID of the specified ADF is present in EF.DIR (call read_aids before use)"""
aid = self._get_aid(adf)
if aid:
aid_full = self._complete_aid(aid)
if aid_full:
return True
return False
def select_adf_by_aid(self, adf="usim"): def select_adf_by_aid(self, adf="usim"):
"""Select ADF.U/ISIM in the Card using its full AID""" """Select ADF.U/ISIM in the Card using its full AID"""
if is_hex(adf): if is_hex(adf):
@@ -1437,6 +1446,9 @@ class SysmoISIMSJA2(UsimCard, IsimCard):
def program(self, p): def program(self, p):
self.verify_adm(h2b(p['pin_adm'])) self.verify_adm(h2b(p['pin_adm']))
# Populate AIDs
self.read_aids()
# This type of card does not allow to reprogram the ICCID. # This type of card does not allow to reprogram the ICCID.
# Reprogramming the ICCID would mess up the card os software # Reprogramming the ICCID would mess up the card os software
# license management, so the ICCID must be kept at its factory # license management, so the ICCID must be kept at its factory
@@ -1514,9 +1526,6 @@ class SysmoISIMSJA2(UsimCard, IsimCard):
if sw != '9000': if sw != '9000':
print("Programming ACC failed with code %s" % sw) print("Programming ACC failed with code %s" % sw)
# Populate AIDs
self.read_aids()
# update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is
# hard linked to EF-USIM_AUTH_KEY) # hard linked to EF-USIM_AUTH_KEY)
self._scc.select_path(['3f00']) self._scc.select_path(['3f00'])
@@ -1527,8 +1536,9 @@ class SysmoISIMSJA2(UsimCard, IsimCard):
self._scc.update_binary('6f20', p['opc'], 17) self._scc.update_binary('6f20', p['opc'], 17)
# update EF-USIM_AUTH_KEY in ADF.ISIM # update EF-USIM_AUTH_KEY in ADF.ISIM
data, sw = self.select_adf_by_aid(adf="isim") if self.adf_present("isim"):
if sw == '9000': self.select_adf_by_aid(adf="isim")
if p.get('ki'): if p.get('ki'):
self._scc.update_binary('af20', p['ki'], 1) self._scc.update_binary('af20', p['ki'], 1)
if p.get('opc'): if p.get('opc'):
@@ -1575,8 +1585,9 @@ class SysmoISIMSJA2(UsimCard, IsimCard):
if sw != '9000': if sw != '9000':
print("Programming IMPU failed with code %s" % sw) print("Programming IMPU failed with code %s" % sw)
data, sw = self.select_adf_by_aid(adf="usim") if self.adf_present("usim"):
if sw == '9000': self.select_adf_by_aid(adf="usim")
# EF.AD in ADF.USIM # EF.AD in ADF.USIM
if (p.get('mcc') and p.get('mnc')) or p.get('opmode'): if (p.get('mcc') and p.get('mnc')) or p.get('opmode'):
if p.get('mcc') and p.get('mnc'): if p.get('mcc') and p.get('mnc'):