<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17018">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card"<br><br>This reverts commit f8299451179cf0cb22d23ff7a9c6f5ced8ed7e20.<br><br>Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914<br>---<br>M pySim-read.py<br>M pysim-testdata/Fairwaves-SIM.ok<br>M pysim-testdata/Wavemobile-SIM.ok<br>M pysim-testdata/fakemagicsim.ok<br>M pysim-testdata/sysmoISIM-SJA2.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>M pysim-testdata/sysmosim-gr1.ok<br>7 files changed, 1 insertion(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/17018/1</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>old mode 100644</span><br><span>new mode 100755</span><br><span>index 662ee54..4bfa900</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, format_xplmn_w_act</span><br><span> </span><br><span> </span><br><span> def parse_options():</span><br><span>@@ -121,17 +121,6 @@</span><br><span> else:</span><br><span> print("SMSP: Can't read, response code = %s" % (sw,))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # EF.SPN</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = scc.read_binary(EF['SPN'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- spn_res = dec_spn(res)</span><br><span style="color: hsl(0, 100%, 40%);">- print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % (spn_res[0], spn_res[1], spn_res[2],))</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- print("SPN: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(0, 100%, 40%);">- except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- print("SPN: Can't read file -- %s" % (str(e),))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # EF.PLMNsel</span><br><span> try:</span><br><span> (res, sw) = scc.read_binary(EF['PLMNsel'])</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index 94df376..6150469 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 8988219000000117833</span><br><span> IMSI: 001010000000111</span><br><span> SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: Fairwaves</span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: False</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span> ffffff0000 # unused</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 8b14a30..b0ea8be 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 89445310150011013678</span><br><span> IMSI: 001010000000102</span><br><span> SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: wavemobile</span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: False</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span> fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index 8d4583d..d9bff94 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: Magic</span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: True</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span> OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index 7346134..fb191e0 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 8988211900000000004</span><br><span> IMSI: 001010000000102</span><br><span> SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: </span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: False</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span> fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 5ad34e4..b6a5391 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: </span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: False</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span> fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index b306f4d..d4c3dd9 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -3,9 +3,6 @@</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(0, 100%, 40%);">-SPN: </span><br><span style="color: hsl(0, 100%, 40%);">-Display HPLMN: False</span><br><span style="color: hsl(0, 100%, 40%);">-Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span> OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17018">change 17018</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/+/17018"/><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: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 </div>
<div style="display:none"> Gerrit-Change-Number: 17018 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>