catarrh/pysim
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-16 18:38:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

pySim-read: put try/catch block around select_adf_by_aid()

Browse Source 
Selecting an application may fail, especially when the application does
not exist on the card.

Change-Id: Ia904a74d672cf9551fb4ee062dd606b350b64cef
This commit is contained in:
Philipp Maier
2021-11-15 17:24:44 +01:00
parent 47833bc176
commit abc2336571
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pySim-read.py
View File

@@ -34,6 +34,7 @@ from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map
from pySim.commands import SimCardCommands from pySim.commands import SimCardCommands
from pySim.transport import init_reader, argparse_add_reader_args from pySim.transport import init_reader, argparse_add_reader_args
from pySim.exceptions import SwMatchError
from pySim.cards import card_detect, SimCard, UsimCard, IsimCard from pySim.cards import card_detect, SimCard, UsimCard, IsimCard
from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn
from pySim.utils import format_xplmn_w_act, dec_st from pySim.utils import format_xplmn_w_act, dec_st
@@ -44,6 +45,24 @@ option_parser = argparse.ArgumentParser(prog='pySim-read',
formatter_class=argparse.ArgumentDefaultsHelpFormatter) formatter_class=argparse.ArgumentDefaultsHelpFormatter)
argparse_add_reader_args(option_parser) argparse_add_reader_args(option_parser)
def select_app(adf:str, card:SimCard):
"""Select application by its AID"""
sw = 0
try:
if card._scc.cla_byte == "00":
data, sw = card.select_adf_by_aid(adf)
except SwMatchError as e:
if e.sw_actual == "6a82":
# If we can't select the file because it does not exist, we just remain silent since it means
# that this card just does not have an USIM application installed, which is not an error.
pass
else:
print("ADF." + adf + ": Can't select application -- " + str(e))
except Exception as e:
print("ADF." + adf + ": Can't select application -- " + str(e))
return sw
if __name__ == '__main__': if __name__ == '__main__':
# Parse options # Parse options
@@ -219,7 +238,7 @@ if __name__ == '__main__':
# Check whether we have th AID of USIM, if so select it by its AID # Check whether we have th AID of USIM, if so select it by its AID
# EF.UST - File Id in ADF USIM : 6f38 # EF.UST - File Id in ADF USIM : 6f38
data, sw = card.select_adf_by_aid(adf="usim") sw = select_app("USIM", card)
if sw == '9000': if sw == '9000':
# Select USIM profile # Select USIM profile
usim_card = UsimCard(scc) usim_card = UsimCard(scc)
@@ -269,7 +288,7 @@ if __name__ == '__main__':
print("ePDGSelection: Can't read file -- " + str(e)) print("ePDGSelection: Can't read file -- " + str(e))
# Select ISIM application by its AID # Select ISIM application by its AID
data, sw = card.select_adf_by_aid(adf="isim") sw = select_app("ISIM", card)
if sw == '9000': if sw == '9000':
# Select USIM profile # Select USIM profile
isim_card = IsimCard(scc) isim_card = IsimCard(scc)