<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/22351">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC<br><br>Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b<br>---<br>M pySim-read.py<br>1 file changed, 25 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index b94e709..f901260 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -33,7 +33,7 @@</span><br><span> from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.cards import card_detect, Card</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.cards import card_detect, Card, UsimCard, IsimCard</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn</span><br><span> from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, init_reader, dec_addr_tlv</span><br><span> from pySim.utils import h2s, format_ePDGSelection</span><br><span>@@ -250,9 +250,12 @@</span><br><span> # Check whether we have th AID of USIM, if so select it by its AID</span><br><span> # EF.UST - File Id in ADF USIM : 6f38</span><br><span> if '9000' == card.select_adf_by_aid():</span><br><span style="color: hsl(120, 100%, 40%);">+ # Select USIM profile</span><br><span style="color: hsl(120, 100%, 40%);">+ usim_card = UsimCard(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # EF.EHPLMN</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_USIM_ADF_map['EHPLMN']):</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_ehplmn()</span><br><span style="color: hsl(120, 100%, 40%);">+ if usim_card.file_exists(EF_USIM_ADF_map['EHPLMN']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = usim_card.read_ehplmn()</span><br><span> if sw == '9000':</span><br><span> print("EHPLMN:\n%s" % (res))</span><br><span> else:</span><br><span>@@ -260,10 +263,10 @@</span><br><span> </span><br><span> # EF.UST</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_USIM_ADF_map['UST']):</span><br><span style="color: hsl(120, 100%, 40%);">+ if usim_card.file_exists(EF_USIM_ADF_map['UST']):</span><br><span> # res[0] - EF content of UST</span><br><span> # res[1] - Human readable format of services marked available in UST</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_ust()</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = usim_card.read_ust()</span><br><span> if sw == '9000':</span><br><span> print("USIM Service Table: %s" % res[0])</span><br><span> print("%s" % res[1])</span><br><span>@@ -274,8 +277,8 @@</span><br><span> </span><br><span> #EF.ePDGId - Home ePDG Identifier</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_USIM_ADF_map['ePDGId']):</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_epdgid()</span><br><span style="color: hsl(120, 100%, 40%);">+ if usim_card.file_exists(EF_USIM_ADF_map['ePDGId']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = usim_card.read_epdgid()</span><br><span> if sw == '9000':</span><br><span> print("ePDGId:\n%s" % (len(res) and res or '\tNot available\n',))</span><br><span> else:</span><br><span>@@ -285,8 +288,8 @@</span><br><span> </span><br><span> #EF.ePDGSelection - ePDG Selection Information</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_USIM_ADF_map['ePDGSelection']):</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_ePDGSelection()</span><br><span style="color: hsl(120, 100%, 40%);">+ if usim_card.file_exists(EF_USIM_ADF_map['ePDGSelection']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = usim_card.read_ePDGSelection()</span><br><span> if sw == '9000':</span><br><span> print("ePDGSelection:\n%s" % (res,))</span><br><span> else:</span><br><span>@@ -296,18 +299,21 @@</span><br><span> </span><br><span> # Select ISIM application by its AID</span><br><span> if '9000' == card.select_adf_by_aid(adf="isim"):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Select USIM profile</span><br><span style="color: hsl(120, 100%, 40%);">+ isim_card = IsimCard(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #EF.P-CSCF - P-CSCF Address</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_ISIM_ADF_map['PCSCF']):</span><br><span style="color: hsl(0, 100%, 40%);">- res = card.read_pcscf()</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim_card.file_exists(EF_ISIM_ADF_map['PCSCF']):</span><br><span style="color: hsl(120, 100%, 40%);">+ res = isim_card.read_pcscf()</span><br><span> print("P-CSCF:\n%s" % (len(res) and res or '\tNot available\n',))</span><br><span> except Exception as e:</span><br><span> print("P-CSCF: Can't read file -- " + str(e))</span><br><span> </span><br><span> # EF.DOMAIN - Home Network Domain Name e.g. ims.mncXXX.mccXXX.3gppnetwork.org</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_ISIM_ADF_map['DOMAIN']):</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_domain()</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim_card.file_exists(EF_ISIM_ADF_map['DOMAIN']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = isim_card.read_domain()</span><br><span> if sw == '9000':</span><br><span> print("Home Network Domain Name: %s" % (len(res) and res or 'Not available',))</span><br><span> else:</span><br><span>@@ -317,8 +323,8 @@</span><br><span> </span><br><span> # EF.IMPI - IMS private user identity</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_ISIM_ADF_map['IMPI']):</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_impi()</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim_card.file_exists(EF_ISIM_ADF_map['IMPI']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = isim_card.read_impi()</span><br><span> if sw == '9000':</span><br><span> print("IMS private user identity: %s" % (len(res) and res or 'Not available',))</span><br><span> else:</span><br><span>@@ -328,16 +334,16 @@</span><br><span> </span><br><span> # EF.IMPU - IMS public user identity</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_ISIM_ADF_map['IMPU']):</span><br><span style="color: hsl(0, 100%, 40%);">- res = card.read_impu()</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim_card.file_exists(EF_ISIM_ADF_map['IMPU']):</span><br><span style="color: hsl(120, 100%, 40%);">+ res = isim_card.read_impu()</span><br><span> print("IMS public user identity:\n%s" % (len(res) and res or '\tNot available\n',))</span><br><span> except Exception as e:</span><br><span> print("IMS public user identity: Can't read file -- " + str(e))</span><br><span> </span><br><span> # EF.UICCIARI - UICC IARI</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- if card.file_exists(EF_ISIM_ADF_map['UICCIARI']):</span><br><span style="color: hsl(0, 100%, 40%);">- res = card.read_iari()</span><br><span style="color: hsl(120, 100%, 40%);">+ if isim_card.file_exists(EF_ISIM_ADF_map['UICCIARI']):</span><br><span style="color: hsl(120, 100%, 40%);">+ res = isim_card.read_iari()</span><br><span> print("UICC IARI:\n%s" % (len(res) and res or '\tNot available\n',))</span><br><span> except Exception as e:</span><br><span> print("UICC IARI: Can't read file -- " + str(e))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/22351">change 22351</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/+/22351"/><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: Id8b95630e90cb5833482da2690e423e7adefb95b </div>
<div style="display:none"> Gerrit-Change-Number: 22351 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>