<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/18221">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog, pySim-read, do not echo reader id<br><br>pySim-prog and pySim-read currently echo back the pcsc reader id (or<br>baudrate/socket, depending on the interface used). This makes the output<br>unecessarly undeterministic, which becomes a problem when verifying the<br>putput in tests. Lets not echo those variable, user supplied parameters<br>back. Also lets move the code that does the initalization to utils, so<br>that it can be used from pySim-prog and from pySim-read (code dup).<br><br>Change-Id: I243cc332f075d007b1c111292effcc610e874eb3<br>Related: OS#4503<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pySim/utils.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>M tests/pysim-test.sh<br>10 files changed, 32 insertions(+), 47 deletions(-)<br><br></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 c709959..67719b4 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.cards import _cards_classes, card_detect</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid, init_reader</span><br><span> from pySim.ts_51_011 import EF</span><br><span> from pySim.card_handler import *</span><br><span> from pySim.utils import *</span><br><span>@@ -688,21 +688,7 @@</span><br><span> opts = parse_options()</span><br><span> </span><br><span> # Init card reader driver</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.pcsc_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using PC/SC reader (dev=%d) interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % opts.pcsc_dev)</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(0, 100%, 40%);">- elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using Calypso-based (OsmocomBB, sock=%s) reader interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % opts.osmocon_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- else: # Serial reader is default</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using serial reader (port=%s, baudrate=%d) interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % (opts.device, opts.baudrate))</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = init_reader(opts)</span><br><span> </span><br><span> # Create command layer</span><br><span> scc = SimCardCommands(transport=sl)</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 33e93a7..df21531 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -34,8 +34,8 @@</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.cards import card_detect, Card</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn, format_xplmn_w_act, dec_spn, dec_st</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, init_reader</span><br><span> </span><br><span> def parse_options():</span><br><span> </span><br><span>@@ -72,21 +72,7 @@</span><br><span> opts = parse_options()</span><br><span> </span><br><span> # Init card reader driver</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.pcsc_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using PC/SC reader (dev=%d) interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % opts.pcsc_dev)</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(0, 100%, 40%);">- elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using Calypso-based (OsmocomBB, sock=%s) reader interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % opts.osmocon_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- else: # Serial reader is default</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using serial reader (port=%s, baudrate=%d) interface"</span><br><span style="color: hsl(0, 100%, 40%);">- % (opts.device, opts.baudrate))</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = init_reader(opts)</span><br><span> </span><br><span> # Create command layer</span><br><span> scc = SimCardCommands(transport=sl)</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index dbc7337..a1689ca 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -436,3 +436,22 @@</span><br><span> s += "\t%s # %s\n" % (i2h(content), i2s(content))</span><br><span> </span><br><span> return s</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def init_reader(opts):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Init card reader driver</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.pcsc_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using PC/SC reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using serial reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sl</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index 0dbd89f..e5fa1af 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=0) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: Fairwaves-SIM</span><br><span> ICCID: 8988219000000117833</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 2de0892..a5c3a8e 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=3) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: Wavemobile-SIM</span><br><span> ICCID: 89445310150011013678</span><br><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index 80cf3d9..0168b13 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=5) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: fakemagicsim</span><br><span> Can't read AIDs from SIM -- 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 57500eb..8559bdb 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=4) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: sysmoISIM-SJA2</span><br><span> ICCID: 8988211900000000004</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 408f211..75c3862 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=1) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: sysmoUSIM-SJS1</span><br><span> ICCID: 1122334455667788990</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index 833ba83..3fba8e1 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=0) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader interface</span><br><span> Reading ...</span><br><span> Autodetected card type: sysmosim-gr1</span><br><span> Can't read AIDs from SIM -- SW match failed! Expected 9000 and got 9404.</span><br><span>diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh</span><br><span>index a22c372..7ee9834 100755</span><br><span>--- a/tests/pysim-test.sh</span><br><span>+++ b/tests/pysim-test.sh</span><br><span>@@ -78,13 +78,7 @@</span><br><span> stat ./$CARD_NAME.ok > /dev/null</span><br><span> python $PYSIM_READ -p $TERMINAL > $TEMPFILE</span><br><span> set +e</span><br><span style="color: hsl(0, 100%, 40%);">- # Note: We ignore the first line of output in the diff because here</span><br><span style="color: hsl(0, 100%, 40%);">- # pysim would print the device number of the reader and we do not</span><br><span style="color: hsl(0, 100%, 40%);">- # want the test to fail just because the card is put into a different</span><br><span style="color: hsl(0, 100%, 40%);">- # reader device.</span><br><span style="color: hsl(0, 100%, 40%);">- tail -n +2 $CARD_NAME.ok > $CARD_NAME.ok.tmp</span><br><span style="color: hsl(0, 100%, 40%);">- tail -n +2 $TEMPFILE > $CARD_NAME.chk.tmp</span><br><span style="color: hsl(0, 100%, 40%);">- CARD_DIFF=$(diff $CARD_NAME.chk.tmp $CARD_NAME.ok.tmp)</span><br><span style="color: hsl(120, 100%, 40%);">+ CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)</span><br><span> set -e</span><br><span> </span><br><span> if [ "$CARD_DIFF" != "" ]; then</span><br><span>@@ -104,7 +98,7 @@</span><br><span> inc_card_list $CARD_NAME</span><br><span> </span><br><span> echo "Card contents match the test data -- success!"</span><br><span style="color: hsl(0, 100%, 40%);">- rm *.tmp</span><br><span style="color: hsl(120, 100%, 40%);">+ rm $TEMPFILE</span><br><span> }</span><br><span> </span><br><span> # Read out the card using pysim-read and store the result as .ok file. This</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/18221">change 18221</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/+/18221"/><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: I243cc332f075d007b1c111292effcc610e874eb3 </div>
<div style="display:none"> Gerrit-Change-Number: 18221 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: 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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>