<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16947">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: fix reading and parsing of EF.MSISDN<br><br>This change implements parsing of EF.MSISDN (and thus EF.ADN)<br>as per 3GPP TS 31.102, sections 4.2.26 and 4.4.2.3.<br><br>Example (commercial SIM card from 401/02):<br><br> EF.MSISDN: ffffffffffffffffffffffffffff07917787028982f7ffffffffffff<br> Decoded (NPI=1 ToN=1): +77782098287<br><br>Note that sysmoUSIM-SJS1 in the test setup has malformed<br>EF.MSISDN, so that's why the test output is changed.<br><br>Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863<br>---<br>M pySim-read.py<br>M pySim/utils.py<br>M pysim-testdata/sysmoISIM-SJA2.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>4 files changed, 48 insertions(+), 5 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 d753c8b..ce5f8a5 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -37,7 +37,7 @@</span><br><span> import simplejson as json</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn, format_xplmn_w_act, dec_spn</span><br><span> </span><br><span> </span><br><span> def parse_options():</span><br><span>@@ -186,8 +186,10 @@</span><br><span> # print(scc.record_size(['3f00', '7f10', '6f40']))</span><br><span> (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1)</span><br><span> if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- if res[1] != 'f':</span><br><span style="color: hsl(0, 100%, 40%);">- print("MSISDN: %s" % (res,))</span><br><span style="color: hsl(120, 100%, 40%);">+ res_dec = dec_msisdn(res)</span><br><span style="color: hsl(120, 100%, 40%);">+ if res_dec is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ # (npi, ton, msisdn) = res_dec</span><br><span style="color: hsl(120, 100%, 40%);">+ print("MSISDN (NPI=%d ToN=%d): %s" % res_dec)</span><br><span> else:</span><br><span> print("MSISDN: Not available")</span><br><span> else:</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index af4a491..12f66b9 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -258,3 +258,44 @@</span><br><span> mnc += digit2</span><br><span> </span><br><span> return mnc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def dec_msisdn(ef_msisdn):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Decode MSISDN from EF.MSISDN or EF.ADN (same structure).</span><br><span style="color: hsl(120, 100%, 40%);">+ See 3GPP TS 31.102, section 4.2.26 and 4.4.2.3.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Convert from str to (kind of) 'bytes'</span><br><span style="color: hsl(120, 100%, 40%);">+ ef_msisdn = h2b(ef_msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Make sure mandatory fields are present</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(ef_msisdn) < 14:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("EF.MSISDN is too short")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Skip optional Alpha Identifier</span><br><span style="color: hsl(120, 100%, 40%);">+ xlen = len(ef_msisdn) - 14</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn_lhv = ef_msisdn[xlen:]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Parse the length (in bytes) of the BCD encoded number</span><br><span style="color: hsl(120, 100%, 40%);">+ bcd_len = ord(msisdn_lhv[0])</span><br><span style="color: hsl(120, 100%, 40%);">+ # BCD length = length of dial num (max. 10 bytes) + 1 byte ToN and NPI</span><br><span style="color: hsl(120, 100%, 40%);">+ if bcd_len == 0xff:</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bcd_len > 11 or bcd_len < 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Length of MSISDN (%d bytes) is out of range" % bcd_len)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Parse ToN / NPI</span><br><span style="color: hsl(120, 100%, 40%);">+ ton = (ord(msisdn_lhv[1]) >> 4) & 0x07</span><br><span style="color: hsl(120, 100%, 40%);">+ npi = ord(msisdn_lhv[1]) & 0x0f</span><br><span style="color: hsl(120, 100%, 40%);">+ bcd_len -= 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # No MSISDN?</span><br><span style="color: hsl(120, 100%, 40%);">+ if not bcd_len:</span><br><span style="color: hsl(120, 100%, 40%);">+ return (npi, ton, None)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = swap_nibbles(b2h(msisdn_lhv[2:][:bcd_len])).rstrip('f')</span><br><span style="color: hsl(120, 100%, 40%);">+ # International number 10.5.118/3GPP TS 24.008</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ton & 0x01) == 0x01:</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = '+' + msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return (npi, ton, msisdn)</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index a64aa8b..bfef882 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -50,7 +50,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> ACC: 0001</span><br><span style="color: hsl(0, 100%, 40%);">-MSISDN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+MSISDN (NPI=1 ToN=1): +1234</span><br><span> AD: 00000002</span><br><span> Done !</span><br><span> </span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 8def4e3..6d85f38 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -50,7 +50,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> ACC: 0008</span><br><span style="color: hsl(0, 100%, 40%);">-MSISDN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+MSISDN: Can't read file -- Length of MSISDN (136 bytes) is out of range</span><br><span> AD: 00000002</span><br><span> Done !</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16947">change 16947</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/+/16947"/><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: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 </div>
<div style="display:none"> Gerrit-Change-Number: 16947 </div>
<div style="display:none"> Gerrit-PatchSet: 19 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Assignee: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>