<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/19409">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
herlesupreeth: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-read.py: decode contents of EF.AD (Administrative data)<br><br>Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842<br>---<br>M pySim-read.py<br>M pySim/ts_51_011.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>8 files changed, 39 insertions(+), 9 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 d6674a5..2ca0557 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -28,7 +28,7 @@</span><br><span> import random</span><br><span> import re</span><br><span> import sys</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.ts_51_011 import EF, DF, EF_SST_map</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_51_011 import EF, DF, EF_SST_map, EF_AD_mode_map</span><br><span> from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map</span><br><span> from pySim.ts_31_103 import EF_IST_map</span><br><span> </span><br><span>@@ -225,7 +225,15 @@</span><br><span> # EF.AD</span><br><span> (res, sw) = card.read_binary('AD')</span><br><span> if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- print("AD: %s" % (res,))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Administrative data: %s" % (res,))</span><br><span style="color: hsl(120, 100%, 40%);">+ if res[:2] in EF_AD_mode_map:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\tMS operation mode: %s" % (EF_AD_mode_map[res[:2]],))</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\tMS operation mode: (unknown 0x%s)" % (res[:2],))</span><br><span style="color: hsl(120, 100%, 40%);">+ if int(res[4:6], 16) & 0x01:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\tCiphering Indicator: enabled")</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\tCiphering Indicator: disabled")</span><br><span> else:</span><br><span> print("AD: Can't read, response code = %s" % (sw,))</span><br><span> </span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index 37d2bc8..8b73f02 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -313,4 +313,14 @@</span><br><span> 57: 'Multimedia Messaging Service (MMS)',</span><br><span> 58: 'Extension 8',</span><br><span> 59: 'MMS User Connectivity Parameters',</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>\ No newline at end of file</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%);">+# 10.3.18 "EF.AD (Administrative data) "</span><br><span style="color: hsl(120, 100%, 40%);">+EF_AD_mode_map = {</span><br><span style="color: hsl(120, 100%, 40%);">+ '00' : 'normal operation',</span><br><span style="color: hsl(120, 100%, 40%);">+ '80' : 'type approval operations',</span><br><span style="color: hsl(120, 100%, 40%);">+ '01' : 'normal operation + specific facilities',</span><br><span style="color: hsl(120, 100%, 40%);">+ '81' : 'type approval operations + specific facilities',</span><br><span style="color: hsl(120, 100%, 40%);">+ '02' : 'maintenance (off line)',</span><br><span style="color: hsl(120, 100%, 40%);">+ '04' : 'cell test operation',</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index dcdd43c..6dd839c 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -42,7 +42,9 @@</span><br><span> </span><br><span> ACC: 0008</span><br><span> MSISDN: Not available</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: disabled</span><br><span> SIM Service Table: ff3cc3ff030fff0f000fff03f0c0</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 0e41ec0..010a228 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -49,7 +49,9 @@</span><br><span> HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> ACC: abce</span><br><span> MSISDN: Not available</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 00ffff02</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 00ffff02</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: enabled</span><br><span> SIM Service Table: ff33ff0f3c00ff0f000cf0c0f0030000</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index 7ac9e2a..1d1714f 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -16,7 +16,9 @@</span><br><span> HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span> ACC: ffff</span><br><span> MSISDN: Not available</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 000000</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 000000</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: disabled</span><br><span> SIM Service Table: ff3fff0f0300f003000c</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index 82176c6..947cff6 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -54,7 +54,9 @@</span><br><span> </span><br><span> ACC: 0200</span><br><span> MSISDN: Not available</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: disabled</span><br><span> SIM Service Table: ff33ffff3f003f0f300cf0c3f00000</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 55c43ad..da1a1f6 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -54,7 +54,9 @@</span><br><span> </span><br><span> ACC: 0008</span><br><span> MSISDN (NPI=1 ToN=1): +77776336143</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: disabled</span><br><span> SIM Service Table: ff3fffff3f003f1ff00c00c0f00000</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index 684fda7..f4b09c8 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -16,7 +16,9 @@</span><br><span> HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span> ACC: 0008</span><br><span> MSISDN: Not available</span><br><span style="color: hsl(0, 100%, 40%);">-AD: 000000</span><br><span style="color: hsl(120, 100%, 40%);">+Administrative data: 000000</span><br><span style="color: hsl(120, 100%, 40%);">+ MS operation mode: normal operation</span><br><span style="color: hsl(120, 100%, 40%);">+ Ciphering Indicator: disabled</span><br><span> SIM Service Table: ff3fff0f0f0000030000</span><br><span> Service 1 - CHV1 disable function</span><br><span> Service 2 - Abbreviated Dialling Numbers (ADN)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/19409">change 19409</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/+/19409"/><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: I938667bdf99d238eefac205d6dd70db1d714d842 </div>
<div style="display:none"> Gerrit-Change-Number: 19409 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>