<p>Falkenber9 has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24160">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SimCardCommands: detect whether UICC or Classic SIM<br><br>Distinction between UICC or Classic SIM was done<br>in pySim-read only.<br>This patch moves is into SimCardCommands<br>and adds function calls into<br>* pySim-read.py<br>* pySim-prog.py<br>* pySim-shell.py<br><br>Change-Id: I224bd6c91cdaf444e2a94117f64030c024a776a7<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pySim-shell.py<br>M pySim/commands.py<br>4 files changed, 26 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/24160/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index 4c85be7..9191ed6 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -656,6 +656,9 @@</span><br><span> card_handler.get(first)</span><br><span> </span><br><span> if opts.dry_run is False:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Testing for Classic SIM or UICC</span><br><span style="color: hsl(120, 100%, 40%);">+ scc.detect_card_type()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Get card</span><br><span> card = card_detect(opts.type, scc)</span><br><span> if card is None:</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index ebe0e29..2c848dc 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -60,16 +60,8 @@</span><br><span> # Wait for SIM card</span><br><span> sl.wait_for_card()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Assuming UICC SIM</span><br><span style="color: hsl(0, 100%, 40%);">- scc.cla_byte = "00"</span><br><span style="color: hsl(0, 100%, 40%);">- scc.sel_ctrl = "0004"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Testing for Classic SIM or UICC</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = sl.send_apdu(scc.cla_byte + "a4" + scc.sel_ctrl + "02" + "3f00")</span><br><span style="color: hsl(0, 100%, 40%);">- if sw == '6e00':</span><br><span style="color: hsl(0, 100%, 40%);">- # Just a Classic SIM</span><br><span style="color: hsl(0, 100%, 40%);">- scc.cla_byte = "a0"</span><br><span style="color: hsl(0, 100%, 40%);">- scc.sel_ctrl = "0000"</span><br><span style="color: hsl(120, 100%, 40%);">+ scc.detect_card_type()</span><br><span> </span><br><span> # Read the card</span><br><span> print("Reading ...")</span><br><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index bbfe7e9..7a6eaf7 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -475,6 +475,8 @@</span><br><span> </span><br><span> sl.wait_for_card();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ scc.detect_card_type()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> card_handler = card_handler(sl)</span><br><span> </span><br><span> card = card_detect("auto", scc)</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 0b3d9b6..1e14296 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> class SimCardCommands(object):</span><br><span> def __init__(self, transport):</span><br><span> self._tp = transport</span><br><span style="color: hsl(0, 100%, 40%);">- self._cla_byte = "a0"</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cla_byte = "a0" # Non-UICC GSM SIM (see 3GPP TS 11.11, chapter 4.4.1)</span><br><span> self.sel_ctrl = "0000"</span><br><span> </span><br><span> # Extract a single FCP item from TLV</span><br><span>@@ -103,6 +103,25 @@</span><br><span> def sel_ctrl(self, value):</span><br><span> self._sel_ctrl = value</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def detect_card_type(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Detect whether we have UICC or classic SIM and</span><br><span style="color: hsl(120, 100%, 40%);">+ adjust CLA/CTRL bytes accordingly.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ # Assume UICC SIM first</span><br><span style="color: hsl(120, 100%, 40%);">+ self.cla_byte = "00"</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sel_ctrl = "0004"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Try to access MF via UICC command class</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = self._tp.send_apdu(self.cla_byte + "a4" + self.sel_ctrl + "02" + "3f00")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '6e00':</span><br><span style="color: hsl(120, 100%, 40%);">+ # Didn't work, try command class for Classic SIM</span><br><span style="color: hsl(120, 100%, 40%);">+ self.cla_byte = "a0" # Non-UICC GSM SIM (see 3GPP TS 11.11, chapter 4.4.1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sel_ctrl = "0000"</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = self._tp.send_apdu(self.cla_byte + "a4" + self.sel_ctrl + "02" + "3f00")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '6e00':</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ProtocolError("Card is neither UICC nor Classic SIM")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def try_select_path(self, dir_list):</span><br><span> """ Try to select a specified path given as list of hex-string FIDs"""</span><br><span> rv = []</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24160">change 24160</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/+/24160"/><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: I224bd6c91cdaf444e2a94117f64030c024a776a7 </div>
<div style="display:none"> Gerrit-Change-Number: 24160 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Falkenber9 <robert.falkenberg@tu-dortmund.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>